Changeset 190555 in webkit

Timestamp:

Oct 4, 2015 4:25:44 PM (9 years ago)

Author:

fpizlo@apple.com

Message:

CodeBlock.h shouldn't be included from everywhere
​https://bugs.webkit.org/show_bug.cgi?id=149785

Reviewed by Andreas Kling.

• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
• dfg/DFGAdaptiveStructureWatchpoint.cpp:
• interpreter/CallFrame.cpp:

(JSC::CallFrame::callSiteBitsAreBytecodeOffset):
(JSC::CallFrame::callSiteBitsAreCodeOriginIndex):
(JSC::CallFrame::callSiteAsRawBits):
(JSC::CallFrame::callSiteIndex):
(JSC::CallFrame::hasActivation):
(JSC::CallFrame::uncheckedActivation):
(JSC::CallFrame::stack):

• interpreter/CallFrameInlines.h: Removed.
• interpreter/Interpreter.cpp:
• interpreter/StackVisitor.cpp:
• runtime/DirectArguments.cpp:
• runtime/ErrorInstance.cpp:
• runtime/JSArray.cpp:
• runtime/JSCInlines.h:
• runtime/LiteralParser.cpp:
• runtime/NullSetterFunction.cpp:
• tools/JSDollarVMPrototype.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp (modified) (1 diff)
• dfg/DFGAdaptiveStructureWatchpoint.cpp (modified) (1 diff)
• interpreter/CallFrame.cpp (modified) (2 diffs)
• interpreter/CallFrameInlines.h (deleted)
• interpreter/Interpreter.cpp (modified) (1 diff)
• interpreter/StackVisitor.cpp (modified) (1 diff)
• runtime/DirectArguments.cpp (modified) (1 diff)
• runtime/ErrorInstance.cpp (modified) (1 diff)
• runtime/JSArray.cpp (modified) (1 diff)
• runtime/JSCInlines.h (modified) (1 diff)
• runtime/LiteralParser.cpp (modified) (1 diff)
• runtime/NullSetterFunction.cpp (modified) (1 diff)
• tools/JSDollarVMPrototype.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-10-04  Filip Pizlo  <fpizlo@apple.com>
+
+        CodeBlock.h shouldn't be included from everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=149785
+
+        Reviewed by Andreas Kling.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
+        * dfg/DFGAdaptiveStructureWatchpoint.cpp:
+        * interpreter/CallFrame.cpp:
+        (JSC::CallFrame::callSiteBitsAreBytecodeOffset):
+        (JSC::CallFrame::callSiteBitsAreCodeOriginIndex):
+        (JSC::CallFrame::callSiteAsRawBits):
+        (JSC::CallFrame::callSiteIndex):
+        (JSC::CallFrame::hasActivation):
+        (JSC::CallFrame::uncheckedActivation):
+        (JSC::CallFrame::stack):
+        * interpreter/CallFrameInlines.h: Removed.
+        * interpreter/Interpreter.cpp:
+        * interpreter/StackVisitor.cpp:
+        * runtime/DirectArguments.cpp:
+        * runtime/ErrorInstance.cpp:
+        * runtime/JSArray.cpp:
+        * runtime/JSCInlines.h:
+        * runtime/LiteralParser.cpp:
+        * runtime/NullSetterFunction.cpp:
+        * tools/JSDollarVMPrototype.cpp:
+
 2015-10-03  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1503 +1503 @@
                 A7C0C4AD1681067E0017011D /* JSScriptRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C0C4AA167C08CD0017011D /* JSScriptRef.cpp */; };
                 A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */; };
-                A7C1EAEF17987AB600299DB2 /* CallFrameInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A7C1EAF017987AB600299DB2 /* JSStackInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C1EAEB17987AB600299DB2 /* JSStackInlines.h */; };
                 A7C1EAF117987AB600299DB2 /* StackVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1EAEC17987AB600299DB2 /* StackVisitor.cpp */; };
@@ -3393 +3392 @@
                 A7C0C4AB167C08CD0017011D /* JSScriptRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptRefPrivate.h; sourceTree = "<group>"; };
                 A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITPropertyAccess32_64.cpp; sourceTree = "<group>"; };
-                A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallFrameInlines.h; sourceTree = "<group>"; };
                 A7C1EAEB17987AB600299DB2 /* JSStackInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStackInlines.h; sourceTree = "<group>"; };
                 A7C1EAEC17987AB600299DB2 /* StackVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = StackVisitor.cpp; sourceTree = "<group>"; };
@@ -4116 +4114 @@
                                 1429D8DC0ED2205B00B89619 /* CallFrame.h */,
                                 A7F869EC0F95C2EC00558697 /* CallFrameClosure.h */,
-                                A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */,
                                 1429D7D30ED2128200B89619 /* Interpreter.cpp */,
                                 1429D77B0ED20D7300B89619 /* Interpreter.h */,
@@ -6026 +6023 @@
                                 0F64B27A1A7957B2006E4E66 /* CallEdge.h in Headers */,
                                 1429D8DE0ED2205B00B89619 /* CallFrame.h in Headers */,
-                                A7C1EAEF17987AB600299DB2 /* CallFrameInlines.h in Headers */,
                                 62EC9BB71B7EB07C00303AD1 /* CallFrameShuffleData.h in Headers */,
                                 62D755D71B84FB4A001801FA /* CallFrameShuffler.h in Headers */,

trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp

@@ -29 +29 @@
 #if ENABLE(DFG_JIT)
 
+#include "CodeBlock.h"
+#include "DFGCommon.h"
 #include "JSCInlines.h"
 

trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp

@@ -29 +29 @@
 #if ENABLE(DFG_JIT)
 
+#include "CodeBlock.h"
 #include "JSCInlines.h"
 

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -27 +27 @@
 #include "CallFrame.h"
 
-#include "CallFrameInlines.h"
 #include "CodeBlock.h"
 #include "InlineCallFrame.h"
@@ -37 +36 @@
 
 namespace JSC {
+
+bool CallFrame::callSiteBitsAreBytecodeOffset() const
+{
+    ASSERT(codeBlock());
+    switch (codeBlock()->jitType()) {
+    case JITCode::InterpreterThunk:
+    case JITCode::BaselineJIT:
+        return true;
+    case JITCode::None:
+    case JITCode::HostCallThunk:
+        RELEASE_ASSERT_NOT_REACHED();
+        return false;
+    default:
+        return false;
+    }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return false;
+}
+
+bool CallFrame::callSiteBitsAreCodeOriginIndex() const
+{
+    ASSERT(codeBlock());
+    switch (codeBlock()->jitType()) {
+    case JITCode::DFGJIT:
+    case JITCode::FTLJIT:
+        return true;
+    case JITCode::None:
+    case JITCode::HostCallThunk:
+        RELEASE_ASSERT_NOT_REACHED();
+        return false;
+    default:
+        return false;
+    }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return false;
+}
+
+unsigned CallFrame::callSiteAsRawBits() const
+{
+    return this[JSStack::ArgumentCount].tag();
+}
+
+CallSiteIndex CallFrame::callSiteIndex() const
+{
+    return CallSiteIndex(callSiteAsRawBits());
+}
+
+bool CallFrame::hasActivation() const
+{
+    JSValue activation = uncheckedActivation();
+    return !!activation && activation.isCell();
+}
+
+JSValue CallFrame::uncheckedActivation() const
+{
+    CodeBlock* codeBlock = this->codeBlock();
+    RELEASE_ASSERT(codeBlock->needsActivation());
+    VirtualRegister activationRegister = codeBlock->activationRegister();
+    return registers()[activationRegister.offset()].jsValue();
+}
 
 #ifndef NDEBUG

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -33 +33 @@
 #include "BatchedTransitionOptimizer.h"
 #include "CallFrameClosure.h"
-#include "CallFrameInlines.h"
 #include "ClonedArguments.h"
 #include "CodeBlock.h"

trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp

@@ -27 +27 @@
 #include "StackVisitor.h"
 
-#include "CallFrameInlines.h"
 #include "ClonedArguments.h"
 #include "Executable.h"

trunk/Source/JavaScriptCore/runtime/DirectArguments.cpp

@@ -27 +27 @@
 #include "DirectArguments.h"
 
+#include "CodeBlock.h"
 #include "CopyVisitorInlines.h"
 #include "GenericArgumentsInlines.h"

trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp

@@ -22 +22 @@
 #include "ErrorInstance.h"
 
+#include "CodeBlock.h"
 #include "JSScope.h"
 #include "JSCInlines.h"

trunk/Source/JavaScriptCore/runtime/JSArray.cpp

@@ -27 +27 @@
 #include "ButterflyInlines.h"
 #include "CachedCall.h"
+#include "CodeBlock.h"
 #include "CopiedSpace.h"
 #include "Error.h"

trunk/Source/JavaScriptCore/runtime/JSCInlines.h

@@ -38 +38 @@
 // header that pulls in most (all?) of the interesting things in JSC.
 
-#include "CallFrameInlines.h"
 #include "ExceptionHelpers.h"
 #include "GCIncomingRefCountedInlines.h"

trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp

@@ -29 +29 @@
 
 #include "ButterflyInlines.h"
+#include "CodeBlock.h"
 #include "CopiedSpaceInlines.h"
 #include "JSArray.h"

trunk/Source/JavaScriptCore/runtime/NullSetterFunction.cpp

@@ -27 +27 @@
 #include "NullSetterFunction.h"
 
+#include "CodeBlock.h"
 #include "Error.h"
 #include "JSCInlines.h"

trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp

@@ -27 +27 @@
 #include "JSDollarVMPrototype.h"
 
+#include "CodeBlock.h"
 #include "Heap.h"
 #include "HeapIterationScope.h"