[webkit-changes] [97593] trunk/Source/JavaScriptCore

[paroga]

Title: [97593] trunk/Source/_javascript_Core

Revision

97593

Author

par...@webkit.org

Date

2011-10-17 02:01:14 -0700 (Mon, 17 Oct 2011)

Log Message

Interpreter build fix after r97436, r97506, r97532 and r97537.

* interpreter/Interpreter.cpp:
(JSC::Interpreter::privateExecute):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/interpreter/Interpreter.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (97592 => 97593)

--- trunk/Source/_javascript_Core/ChangeLog	2011-10-17 08:58:15 UTC (rev 97592)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-17 09:01:14 UTC (rev 97593)
@@ -1,3 +1,10 @@
+2011-10-17  Patrick Gansterer  <par...@webkit.org>
+
+        Interpreter build fix after r97436, r97506, r97532 and r97537.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+
 2011-10-16  Adam Barth  <aba...@webkit.org>
 
         Always disable ENABLE(ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) and delete associated code

Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (97592 => 97593)

--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2011-10-17 08:58:15 UTC (rev 97592)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2011-10-17 09:01:14 UTC (rev 97593)
@@ -3358,7 +3358,7 @@
 
         JSObject* baseObj = callFrame->r(base).jsValue().toObject(callFrame);
         Identifier& ident = codeBlock->identifier(property);
-        bool result = baseObj->deleteProperty(callFrame, ident);
+        bool result = baseObj->deletePropertyVirtual(callFrame, ident);
         if (!result && codeBlock->isStrictMode()) {
             exceptionValue = createTypeError(callFrame, "Unable to delete property.");
             goto vm_throw;
@@ -3503,7 +3503,7 @@
                 if (jsArray->canSetIndex(i))
                     jsArray->setIndex(*globalData, i, callFrame->r(value).jsValue());
                 else
-                    jsArray->JSArray::put(callFrame, i, callFrame->r(value).jsValue());
+                    jsArray->JSArray::putVirtual(callFrame, i, callFrame->r(value).jsValue());
             } else if (isJSByteArray(globalData, baseValue) && asByteArray(baseValue)->canAccessIndex(i)) {
                 JSByteArray* jsByteArray = asByteArray(baseValue);
                 JSValue jsValue = callFrame->r(value).jsValue();
@@ -3545,12 +3545,12 @@
         bool result;
         uint32_t i;
         if (subscript.getUInt32(i))
-            result = baseObj->deleteProperty(callFrame, i);
+            result = baseObj->deletePropertyVirtual(callFrame, i);
         else {
             CHECK_FOR_EXCEPTION();
             Identifier property(callFrame, subscript.toString(callFrame));
             CHECK_FOR_EXCEPTION();
-            result = baseObj->deleteProperty(callFrame, property);
+            result = baseObj->deletePropertyVirtual(callFrame, property);
         }
         if (!result && codeBlock->isStrictMode()) {
             exceptionValue = createTypeError(callFrame, "Unable to delete property.");
@@ -4609,7 +4609,7 @@
         JSFunction* constructor = asFunction(callFrame->callee());
 #if !ASSERT_DISABLED
         ConstructData constructData;
-        ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
+        ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
 #endif
 
         Structure* structure;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes