Changeset 114183 in webkit for trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

Timestamp:

Apr 13, 2012, 4:44:25 PM (13 years ago)

Author:

[email protected]

Message:

Don't rely on fixed offsets to patch method checks
​https://bugs.webkit.org/show_bug.cgi?id=83958

Reviewed by Oliver Hunt.

• bytecode/StructureStubInfo.h:
  • Add fields for the method check info.
• jit/JIT.cpp:

(JSC::PropertyStubCompilationInfo::copyToStubInfo):

• Store the offsets on the stub info, instead of asserting.

• jit/JIT.h:
  • Delete all the method check related offsets.
• jit/JITPropertyAccess.cpp:

(JSC::JIT::patchMethodCallProto):

• Use the offset from the stubInfo.

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• Pass the stubInfo to patchMethodCallProto.

File:

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

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -1120 +1120 @@
 }
 
-void JIT::patchMethodCallProto(JSGlobalData& globalData, CodeBlock* codeBlock, MethodCallLinkInfo& methodCallLinkInfo, JSObject* callee, Structure* structure, JSObject* proto, ReturnAddressPtr returnAddress)
+void JIT::patchMethodCallProto(JSGlobalData& globalData, CodeBlock* codeBlock, MethodCallLinkInfo& methodCallLinkInfo, StructureStubInfo& stubInfo, JSObject* callee, Structure* structure, JSObject* proto, ReturnAddressPtr returnAddress)
 {
     RepatchBuffer repatchBuffer(codeBlock);
@@ -1128 +1128 @@
     
     Structure* prototypeStructure = proto->structure();
-    methodCallLinkInfo.cachedPrototypeStructure.set(globalData, structureLocation.dataLabelPtrAtOffset(patchOffsetMethodCheckProtoStruct), codeBlock->ownerExecutable(), prototypeStructure);
-    methodCallLinkInfo.cachedPrototype.set(globalData, structureLocation.dataLabelPtrAtOffset(patchOffsetMethodCheckProtoObj), codeBlock->ownerExecutable(), proto);
-    methodCallLinkInfo.cachedFunction.set(globalData, structureLocation.dataLabelPtrAtOffset(patchOffsetMethodCheckPutFunction), codeBlock->ownerExecutable(), callee);
+    methodCallLinkInfo.cachedPrototypeStructure.set(globalData, structureLocation.dataLabelPtrAtOffset(stubInfo.patch.baseline.methodCheckProtoStructureToCompare), codeBlock->ownerExecutable(), prototypeStructure);
+    methodCallLinkInfo.cachedPrototype.set(globalData, structureLocation.dataLabelPtrAtOffset(stubInfo.patch.baseline.methodCheckProtoObj), codeBlock->ownerExecutable(), proto);
+    methodCallLinkInfo.cachedFunction.set(globalData, structureLocation.dataLabelPtrAtOffset(stubInfo.patch.baseline.methodCheckPutFunction), codeBlock->ownerExecutable(), callee);
     repatchBuffer.relinkCallerToFunction(returnAddress, FunctionPtr(cti_op_get_by_id_method_check_update));
 }