Changeset 166218 in webkit for trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp

Timestamp:

Mar 24, 2014, 8:44:52 PM (11 years ago)

Author:

[email protected]

Message:

More scaffolding for a stub routine to have a stub recursively embedded inside it
​https://bugs.webkit.org/show_bug.cgi?id=130770

Reviewed by Oliver Hunt.

• bytecode/CallLinkInfo.cpp:

(JSC::CallLinkInfo::unlink): VM& argument is superfluous.
(JSC::CallLinkInfo::visitWeak): Factor this out, it used to be in CodeBlock::finalizeUnconditionally().

• bytecode/CallLinkInfo.h:
• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::finalizeUnconditionally): Factor out some functionality into CallLinkInfo::visitWeak(), and make sure we pass RepatchBuffer& in more places.
(JSC::CodeBlock::unlinkCalls):
(JSC::CodeBlock::unlinkIncomingCalls):

• bytecode/PolymorphicGetByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak().

(JSC::GetByIdAccess::visitWeak):
(JSC::PolymorphicGetByIdList::visitWeak):

• bytecode/PolymorphicGetByIdList.h:
• bytecode/PolymorphicPutByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak().

(JSC::PutByIdAccess::visitWeak):
(JSC::PolymorphicPutByIdList::visitWeak):

• bytecode/PolymorphicPutByIdList.h:
• bytecode/StructureStubInfo.cpp: Pass RepatchBuffer& through.

(JSC::StructureStubInfo::visitWeakReferences):

• bytecode/StructureStubInfo.h:
• jit/ClosureCallStubRoutine.cpp: isClosureCall is unused.

(JSC::ClosureCallStubRoutine::ClosureCallStubRoutine):

• jit/GCAwareJITStubRoutine.cpp:

(JSC::GCAwareJITStubRoutine::GCAwareJITStubRoutine):
(JSC::createJITStubRoutine):

• jit/GCAwareJITStubRoutine.h: Make it easier to construct one of these.

(JSC::GCAwareJITStubRoutine::isClosureCall): Deleted.

• jit/JITStubRoutine.cpp:

(JSC::JITStubRoutine::visitWeak): This will allow future JITStubRoutine subclasses to have stubs recursively embedded inside them.

• jit/JITStubRoutine.h:
• jit/Repatch.cpp:

(JSC::generateGetByIdStub): Fix a possible GC bug where we weren't making the stub routine GC aware.
(JSC::emitCustomSetterStub): Clean up some code.

File:

• trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp

@@ -38 +38 @@
 
 GCAwareJITStubRoutine::GCAwareJITStubRoutine(
-    const MacroAssemblerCodeRef& code, VM& vm, bool isClosureCall)
+    const MacroAssemblerCodeRef& code, VM& vm)
     : JITStubRoutine(code)
     , m_mayBeExecuting(false)
     , m_isJettisoned(false)
-    , m_isClosureCall(isClosureCall)
 {
     vm.heap.m_jitStubRoutines.add(this);
@@ -99 +98 @@
     const MacroAssemblerCodeRef& code,
     VM& vm,
-    const JSCell*,
-    bool makesCalls)
-{
-    if (!makesCalls)
-        return adoptRef(new JITStubRoutine(code));
-
-    return static_pointer_cast<JITStubRoutine>(
-        adoptRef(new GCAwareJITStubRoutine(code, vm)));
-}
-
-PassRefPtr<JITStubRoutine> createJITStubRoutine(
-    const MacroAssemblerCodeRef& code,
-    VM& vm,
     const JSCell* owner,
     bool makesCalls,
@@ -118 +104 @@
     if (!makesCalls)
         return adoptRef(new JITStubRoutine(code));
+    
+    if (!object) {
+        return static_pointer_cast<JITStubRoutine>(
+            adoptRef(new GCAwareJITStubRoutine(code, vm)));
+    }
     
     return static_pointer_cast<JITStubRoutine>(