Changeset 190589 in webkit for trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h

Timestamp:

Oct 5, 2015, 4:31:53 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling back in r190450
​https://bugs.webkit.org/show_bug.cgi?id=149727

The cause of the leak was VM shutdown, which happens in workers.

The fix is for CodeBlockSet to participate in lastChanceToFinalize,
since it's responsible for running CodeBlock destructors.

I ran the leaks tests locally and did not see any CodeBlock-related leaks.

Restored changesets:

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

File:

• trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h

@@ -30 +30 @@
 #include "CodeBlockHash.h"
 #include "CodeOrigin.h"
-#include "Executable.h"
 #include "ValueRecovery.h"
 #include "WriteBarrier.h"
@@ -43 +42 @@
 struct InlineCallFrame;
 class ExecState;
-class ScriptExecutable;
 class JSFunction;
 
@@ -175 +173 @@
     
     Vector<ValueRecovery> arguments; // Includes 'this'.
-    WriteBarrier<ScriptExecutable> executable;
+    WriteBarrier<CodeBlock> baselineCodeBlock;
     ValueRecovery calleeRecovery;
     CodeOrigin directCaller;
@@ -210 +208 @@
     CString hashAsStringIfPossible() const;
     
-    CodeBlock* baselineCodeBlock() const;
-    
     void setStackOffset(signed offset)
     {
@@ -220 +216 @@
     ptrdiff_t callerFrameOffset() const { return stackOffset * sizeof(Register) + CallFrame::callerFrameOffset(); }
     ptrdiff_t returnPCOffset() const { return stackOffset * sizeof(Register) + CallFrame::returnPCOffset(); }
+
+    bool isStrictMode() const { return baselineCodeBlock->isStrictMode(); }
 
     void dumpBriefFunctionInformation(PrintStream&) const;
@@ -232 +230 @@
 {
     RELEASE_ASSERT(inlineCallFrame);
-    ScriptExecutable* executable = inlineCallFrame->executable.get();
-    RELEASE_ASSERT(executable->structure()->classInfo() == FunctionExecutable::info());
-    return static_cast<FunctionExecutable*>(executable)->baselineCodeBlockFor(inlineCallFrame->specializationKind());
+    return inlineCallFrame->baselineCodeBlock.get();
 }