Changeset 44743 in webkit for trunk/JavaScriptCore/jit/JIT.h

Timestamp:

Jun 16, 2009, 3:20:35 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-16 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Initialize m_bytecodeIndex to -1 in JIT, and correctly initialize
it for each type of stub using the return address to find the correct
offset.

• jit/JIT.cpp: (JSC::JIT::JIT):
• jit/JIT.h: (JSC::JIT::compileGetByIdProto): (JSC::JIT::compileGetByIdSelfList): (JSC::JIT::compileGetByIdProtoList): (JSC::JIT::compileGetByIdChainList): (JSC::JIT::compileGetByIdChain): (JSC::JIT::compilePutByIdTransition): (JSC::JIT::compileCTIMachineTrampolines): (JSC::JIT::compilePatchGetArrayLength):
• jit/JITStubCall.h: (JSC::JITStubCall::call):

File:

• trunk/JavaScriptCore/jit/JIT.h (modified) (8 diffs)

trunk/JavaScriptCore/jit/JIT.h

@@ -338 +338 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileGetByIdProto(stubInfo, structure, prototypeStructure, cachedOffset, returnAddress, callFrame);
         }
@@ -344 +347 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileGetByIdSelfList(stubInfo, polymorphicStructures, currentIndex, structure, cachedOffset);
         }
@@ -349 +355 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileGetByIdProtoList(stubInfo, prototypeStructureList, currentIndex, structure, prototypeStructure, cachedOffset, callFrame);
         }
@@ -354 +363 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileGetByIdChainList(stubInfo, prototypeStructureList, currentIndex, structure, chain, count, cachedOffset, callFrame);
         }
@@ -360 +372 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileGetByIdChain(stubInfo, structure, chain, count, cachedOffset, returnAddress, callFrame);
         }
@@ -366 +381 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompilePutByIdTransition(stubInfo, oldStructure, newStructure, cachedOffset, chain, returnAddress);
         }
@@ -372 +390 @@
         {
             JIT jit(globalData);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             jit.privateCompileCTIMachineTrampolines(executablePool, globalData, ctiArrayLengthTrampoline, ctiStringLengthTrampoline, ctiVirtualCallPreLink, ctiVirtualCallLink, ctiVirtualCall, ctiNativeCallThunk);
         }
@@ -382 +403 @@
         {
             JIT jit(globalData, codeBlock);
+#if ENABLE(OPCODE_SAMPLING)
+            jit->m_bytecodeIndex = jit->m_codeBlock->getCallReturnOffset(returnAddress.value());
+#endif
             return jit.privateCompilePatchGetArrayLength(returnAddress);
         }