Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 3 insertions, 21 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGAbstractValue.h b/Source/JavaScriptCore/dfg/DFGAbstractValue.h
index 5382cd3ad..c198b5e52 100644
--- a/Source/JavaScriptCore/dfg/DFGAbstractValue.h
+++ b/Source/JavaScriptCore/dfg/DFGAbstractValue.h
@@ -458,29 +458,11 @@ struct AbstractValue {
 private:
     void clobberArrayModes()
     {
-        if (m_arrayModes == ALL_ARRAY_MODES)
-            return;
-        
-        if (LIKELY(m_arrayModes & asArrayModes(NonArray)))
-            m_arrayModes = ALL_ARRAY_MODES;
-        else
-            clobberArrayModesSlow();
+        // FIXME: We could make this try to predict the set of array modes that this object
+        // could have in the future. For now, just do the simple thing.
+        m_arrayModes = ALL_ARRAY_MODES;
     }
     
-    void clobberArrayModesSlow()
-    {
-        if (m_arrayModes & asArrayModes(ArrayClass))
-            m_arrayModes = ALL_ARRAY_MODES;
-        else if (m_arrayModes & asArrayModes(NonArrayWithContiguous))
-            m_arrayModes |= asArrayModes(NonArrayWithArrayStorage) | asArrayModes(NonArrayWithSlowPutArrayStorage);
-        else if (m_arrayModes & asArrayModes(ArrayWithContiguous))
-            m_arrayModes |= asArrayModes(ArrayWithArrayStorage) | asArrayModes(ArrayWithSlowPutArrayStorage);
-        else if (m_arrayModes & asArrayModes(NonArrayWithArrayStorage))
-            m_arrayModes |= asArrayModes(NonArrayWithSlowPutArrayStorage);
-        else if (m_arrayModes & asArrayModes(ArrayWithArrayStorage))
-            m_arrayModes |= asArrayModes(ArrayWithArrayStorage);
-    }
-
     void setFuturePossibleStructure(Structure* structure)
     {
         if (structure->transitionWatchpointSetIsStillValid())