Changeset 190809 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITCode.h

Timestamp:

Oct 9, 2015, 10:54:16 AM (10 years ago)

Author:

[email protected]

Message:

2015-10-09 Geoffrey Garen <​[email protected]>

Unreviewed, rolling out r190694
​https://bugs.webkit.org/show_bug.cgi?id=148560

Crashes seen on PLT bots and facebook.com.

Reverted changesets:

"CodeBlock should be a GC object"
​https://bugs.webkit.org/show_bug.cgi?id=149727
​http://trac.webkit.org/changeset/190694

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITCode.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITCode.h

@@ -29 +29 @@
 #if ENABLE(DFG_JIT)
 
-#include "CodeBlock.h"
 #include "CompilationResult.h"
 #include "DFGCommonData.h"
@@ -118 +117 @@
 
     RegisterSet liveRegistersToPreserveAtExceptionHandlingCallSite(CodeBlock*, CallSiteIndex) override;
-#if ENABLE(FTL_JIT)
-    CodeBlock* osrEntryBlock() { return m_osrEntryBlock.get(); }
-    void setOSREntryBlock(VM& vm, const JSCell* owner, CodeBlock* osrEntryBlock) { m_osrEntryBlock.set(vm, owner, osrEntryBlock); }
-    void clearOSREntryBlock() { m_osrEntryBlock.clear(); }
-#endif
-    
+
 private:
     friend class JITCompiler; // Allow JITCompiler to call setCodeRef().
@@ -137 +131 @@
     uint8_t nestedTriggerIsSet { 0 };
     UpperTierExecutionCounter tierUpCounter;
-    WriteBarrier<CodeBlock> m_osrEntryBlock;
+    RefPtr<CodeBlock> osrEntryBlock;
     unsigned osrEntryRetry;
     bool abandonOSREntry;