Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 18 insertions, 18 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGVariableAccessData.h b/Source/JavaScriptCore/dfg/DFGVariableAccessData.h
index 3dfd94d01..382907d27 100644
--- a/Source/JavaScriptCore/dfg/DFGVariableAccessData.h
+++ b/Source/JavaScriptCore/dfg/DFGVariableAccessData.h
@@ -29,7 +29,7 @@
 #include "DFGDoubleFormatState.h"
 #include "DFGNodeFlags.h"
 #include "Operands.h"
-#include "PredictedType.h"
+#include "SpeculatedType.h"
 #include "VirtualRegister.h"
 #include <wtf/Platform.h>
 #include <wtf/UnionFind.h>
@@ -43,8 +43,8 @@ public:
 
     VariableAccessData()
         : m_local(static_cast<VirtualRegister>(std::numeric_limits<int>::min()))
-        , m_prediction(PredictNone)
-        , m_argumentAwarePrediction(PredictNone)
+        , m_prediction(SpecNone)
+        , m_argumentAwarePrediction(SpecNone)
         , m_flags(0)
         , m_doubleFormatState(EmptyDoubleFormatState)
         , m_isCaptured(false)
@@ -55,8 +55,8 @@ public:
     
     VariableAccessData(VirtualRegister local, bool isCaptured)
         : m_local(local)
-        , m_prediction(PredictNone)
-        , m_argumentAwarePrediction(PredictNone)
+        , m_prediction(SpecNone)
+        , m_argumentAwarePrediction(SpecNone)
         , m_flags(0)
         , m_doubleFormatState(EmptyDoubleFormatState)
         , m_isCaptured(isCaptured)
@@ -104,33 +104,33 @@ public:
         return m_isArgumentsAlias;
     }
     
-    bool predict(PredictedType prediction)
+    bool predict(SpeculatedType prediction)
     {
         VariableAccessData* self = find();
-        bool result = mergePrediction(self->m_prediction, prediction);
+        bool result = mergeSpeculation(self->m_prediction, prediction);
         if (result)
-            mergePrediction(m_argumentAwarePrediction, m_prediction);
+            mergeSpeculation(m_argumentAwarePrediction, m_prediction);
         return result;
     }
     
-    PredictedType nonUnifiedPrediction()
+    SpeculatedType nonUnifiedPrediction()
     {
         return m_prediction;
     }
     
-    PredictedType prediction()
+    SpeculatedType prediction()
     {
         return find()->m_prediction;
     }
     
-    PredictedType argumentAwarePrediction()
+    SpeculatedType argumentAwarePrediction()
     {
         return find()->m_argumentAwarePrediction;
     }
     
-    bool mergeArgumentAwarePrediction(PredictedType prediction)
+    bool mergeArgumentAwarePrediction(SpeculatedType prediction)
     {
-        return mergePrediction(find()->m_argumentAwarePrediction, prediction);
+        return mergeSpeculation(find()->m_argumentAwarePrediction, prediction);
     }
     
     void clearVotes()
@@ -161,12 +161,12 @@ public:
         
         // If the variable is not a number prediction, then this doesn't
         // make any sense.
-        if (!isNumberPrediction(prediction()))
+        if (!isNumberSpeculation(prediction()))
             return false;
         
         // If the variable is predicted to hold only doubles, then it's a
         // no-brainer: it should be formatted as a double.
-        if (isDoublePrediction(prediction()))
+        if (isDoubleSpeculation(prediction()))
             return true;
         
         // If the variable is known to be used as an integer, then be safe -
@@ -225,7 +225,7 @@ public:
         if (m_doubleFormatState != UsingDoubleFormat)
             return false;
         
-        return mergePrediction(m_prediction, PredictDouble);
+        return mergeSpeculation(m_prediction, SpecDouble);
     }
     
     NodeFlags flags() const { return m_flags; }
@@ -246,8 +246,8 @@ private:
     // usage for variable access nodes do be significant.
 
     VirtualRegister m_local;
-    PredictedType m_prediction;
-    PredictedType m_argumentAwarePrediction;
+    SpeculatedType m_prediction;
+    SpeculatedType m_argumentAwarePrediction;
     NodeFlags m_flags;
     
     float m_votes[2];