Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal

1 files changed, 9 insertions, 9 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGArrayMode.cpp b/Source/JavaScriptCore/dfg/DFGArrayMode.cpp
index 623e9d743..a3aafde01 100644
--- a/Source/JavaScriptCore/dfg/DFGArrayMode.cpp
+++ b/Source/JavaScriptCore/dfg/DFGArrayMode.cpp
@@ -40,7 +40,7 @@ Array::Mode fromObserved(ArrayProfile* profile, Array::Action action, bool makeS
     case asArrayModes(NonArray):
         if (action == Array::Write && !profile->mayInterceptIndexedAccesses())
             return Array::ToContiguous; // FIXME: we don't know whether to go to contiguous or array storage. We're making a static guess here. In future we should use exit profiling for this.
-        return Array::Undecided;
+        return Array::SelectUsingPredictions;
     case asArrayModes(NonArrayWithContiguous):
         return makeSafe ? Array::ContiguousOutOfBounds : (profile->mayStoreToHole() ? Array::ContiguousToTail : Array::Contiguous);
     case asArrayModes(ArrayWithContiguous):
@@ -71,23 +71,23 @@ Array::Mode fromObserved(ArrayProfile* profile, Array::Action action, bool makeS
     case asArrayModes(NonArray) | asArrayModes(NonArrayWithContiguous):
         if (action == Array::Write && !profile->mayInterceptIndexedAccesses())
             return Array::ToContiguous;
-        return Array::Undecided;
+        return Array::SelectUsingPredictions;
     case asArrayModes(NonArray) | asArrayModes(NonArrayWithContiguous) | asArrayModes(NonArrayWithArrayStorage):
     case asArrayModes(NonArray) | asArrayModes(NonArrayWithArrayStorage):
         if (action == Array::Write && !profile->mayInterceptIndexedAccesses())
             return Array::ToArrayStorage;
-        return Array::Undecided;
+        return Array::SelectUsingPredictions;
     case asArrayModes(NonArray) | asArrayModes(NonArrayWithSlowPutArrayStorage):
     case asArrayModes(NonArray) | asArrayModes(NonArrayWithArrayStorage) | asArrayModes(NonArrayWithSlowPutArrayStorage):
         if (action == Array::Write && !profile->mayInterceptIndexedAccesses())
             return Array::ToSlowPutArrayStorage;
-        return Array::Undecided;
+        return Array::SelectUsingPredictions;
     default:
         // We know that this is possibly a kind of array for which, though there is no
         // useful data in the array profile, we may be able to extract useful data from
         // the value profiles of the inputs. Hence, we leave it as undecided, and let
         // the predictions propagator decide later.
-        return Array::Undecided;
+        return Array::SelectUsingPredictions;
     }
 }
 
@@ -110,7 +110,7 @@ Array::Mode refineArrayMode(Array::Mode arrayMode, SpeculatedType base, Speculat
         return Array::ForceExit;
     }
     
-    if (arrayMode != Array::Undecided)
+    if (arrayMode != Array::SelectUsingPredictions)
         return arrayMode;
     
     if (isStringSpeculation(base))
@@ -250,7 +250,7 @@ bool modeAlreadyChecked(AbstractValue& value, Array::Mode arrayMode)
     case Array::Float64Array:
         return isFloat64ArraySpeculation(value.m_type);
         
-    case Array::Undecided:
+    case Array::SelectUsingPredictions:
     case Array::Unprofiled:
         break;
     }
@@ -262,8 +262,8 @@ bool modeAlreadyChecked(AbstractValue& value, Array::Mode arrayMode)
 const char* modeToString(Array::Mode mode)
 {
     switch (mode) {
-    case Array::Undecided:
-        return "Undecided";
+    case Array::SelectUsingPredictions:
+        return "SelectUsingPredictions";
     case Array::Unprofiled:
         return "Unprofiled";
     case Array::Generic: