Changeset 187750 in webkit for trunk/Source/JavaScriptCore/jit/JITOperations.cpp

Timestamp:

Aug 3, 2015, 12:25:03 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

Don't set up the callsite to operationGetByValDefault when the optimization is already done
​https://bugs.webkit.org/show_bug.cgi?id=147577

Reviewed by Filip Pizlo.

operationGetByValDefault should be called only when the IC is not set.
operationGetByValString breaks this invariant and ASSERT(!byValInfo.stubRoutine) in
operationGetByValDefault raises the assertion failure.
In this patch, we change the callsite setting up code in operationGetByValString when
the IC is already set. And to make the operation's meaning explicitly, we changed the
name operationGetByValDefault to operationGetByValOptimize, that is aligned to the
GetById case.

• jit/JITOperations.cpp:
• jit/JITOperations.h:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::emitSlow_op_get_by_val):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::emitSlow_op_get_by_val):

• tests/stress/operation-get-by-val-default-should-not-called-for-already-optimized-site.js: Added.

(hello):

File:

• trunk/Source/JavaScriptCore/jit/JITOperations.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -1510 +1510 @@
 }
 
-EncodedJSValue JIT_OPERATION operationGetByValDefault(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ArrayProfile* arrayProfile)
+EncodedJSValue JIT_OPERATION operationGetByValOptimize(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ArrayProfile* arrayProfile)
 {
     VM& vm = exec->vm();
@@ -1644 +1644 @@
         else {
             result = baseValue.get(exec, i);
-            if (!isJSString(baseValue))
-                ctiPatchCallByReturnAddress(exec->codeBlock(), ReturnAddressPtr(OUR_RETURN_ADDRESS), FunctionPtr(operationGetByValDefault));
+            if (!isJSString(baseValue)) {
+                unsigned bytecodeOffset = exec->locationAsBytecodeOffset();
+                ASSERT(bytecodeOffset);
+                ByValInfo& byValInfo = exec->codeBlock()->getByValInfo(bytecodeOffset - 1);
+                ctiPatchCallByReturnAddress(exec->codeBlock(), ReturnAddressPtr(OUR_RETURN_ADDRESS), FunctionPtr(byValInfo.stubRoutine ? operationGetByValGeneric : operationGetByValOptimize));
+            }
         }
     } else {