JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / dfg / DFGEdge.h

diff --git a/dfg/DFGEdge.h b/dfg/DFGEdge.h
index 4ceda0cbaa733bac78e4043dd8a41b11a732dee2..7a05fabae05e4faf329ecfa86735ebf60c741765 100644 (file)
--- a/dfg/DFGEdge.h
+++ b/dfg/DFGEdge.h
@@ -115,10 +115,6 @@ public:
     {
         return proofStatus() == IsProved;
     }
     {
         return proofStatus() == IsProved;
     }

-    bool needsCheck() const
-    {
-        return proofStatus() == NeedsCheck;
-    }

     
     bool willNotHaveCheck() const
     {
     
     bool willNotHaveCheck() const
     {


@@ -205,13 +201,13 @@ private:
         ASSERT((shiftedValue >> shift()) == bitwise_cast<uintptr_t>(node));
         ASSERT(useKind >= 0 && useKind < LastUseKind);
         ASSERT((static_cast<uintptr_t>(LastUseKind) << 2) <= (static_cast<uintptr_t>(2) << shift()));
         ASSERT((shiftedValue >> shift()) == bitwise_cast<uintptr_t>(node));
         ASSERT(useKind >= 0 && useKind < LastUseKind);
         ASSERT((static_cast<uintptr_t>(LastUseKind) << 2) <= (static_cast<uintptr_t>(2) << shift()));

-        return shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | DFG::isProved(proofStatus);
+        return shiftedValue | (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));

     }
     
 #else
     static uintptr_t makeWord(UseKind useKind, ProofStatus proofStatus, KillStatus killStatus)
     {
     }
     
 #else
     static uintptr_t makeWord(UseKind useKind, ProofStatus proofStatus, KillStatus killStatus)
     {

-        return (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | DFG::isProved(proofStatus);
+        return (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));

     }
     
     Node* m_node;
     }
     
     Node* m_node;