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

Timestamp:

Oct 3, 2015, 6:45:21 PM (10 years ago)

Author:

[email protected]

Message:

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

Caused a lot of leaks (Requested by ap on #webkit).

Reverted changeset:

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

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"
@@ -42 +43 @@
 struct InlineCallFrame;
 class ExecState;
+class ScriptExecutable;
 class JSFunction;
 
@@ -173 +175 @@
     
     Vector<ValueRecovery> arguments; // Includes 'this'.
-    WriteBarrier<CodeBlock> baselineCodeBlock;
+    WriteBarrier<ScriptExecutable> executable;
     ValueRecovery calleeRecovery;
     CodeOrigin directCaller;
@@ -208 +210 @@
     CString hashAsStringIfPossible() const;
     
+    CodeBlock* baselineCodeBlock() const;
+    
     void setStackOffset(signed offset)
     {
@@ -216 +220 @@
     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;
@@ -230 +232 @@
 {
     RELEASE_ASSERT(inlineCallFrame);
-    return inlineCallFrame->baselineCodeBlock.get();
+    ScriptExecutable* executable = inlineCallFrame->executable.get();
+    RELEASE_ASSERT(executable->structure()->classInfo() == FunctionExecutable::info());
+    return static_cast<FunctionExecutable*>(executable)->baselineCodeBlockFor(inlineCallFrame->specializationKind());
 }