Changeset 251263 in webkit for trunk/Source/JavaScriptCore/interpreter

Timestamp:

Oct 17, 2019, 3:18:57 PM (6 years ago)

Author:

[email protected]

Message:

Use constexpr in more places and remove some unnecessary external linkage.
​https://bugs.webkit.org/show_bug.cgi?id=203115

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

• API/JSWrapperMap.mm:
• heap/MarkedBlock.cpp:
• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):

• inspector/ScriptCallStack.h:
• interpreter/CLoopStack.h:
• interpreter/CallFrame.h:
• interpreter/ShadowChicken.h:
• jit/AssemblyHelpers.cpp:

(JSC::emitRandomThunkImpl):

• jit/GPRInfo.cpp:
• jit/GPRInfo.h:
• jit/JIT.h:
• jit/PCToCodeOriginMap.cpp:
• jit/SpecializedThunkJIT.h:
• jit/ThunkGenerators.cpp:

(JSC::roundThunkGenerator):

• jit/UnusedPointer.h:
• llint/LLIntData.h:
• llint/LLIntPCRanges.h:
• parser/Lexer.h:
• parser/Nodes.h:
• runtime/CodeCache.cpp:
• runtime/CodeCache.h:
• runtime/ErrorInstance.h:
• runtime/JSAsyncFunction.h:
• runtime/JSAsyncGeneratorFunction.h:
• runtime/JSBoundFunction.h:
• runtime/JSCallee.h:
• runtime/JSFunction.h:
• runtime/JSGeneratorFunction.h:
• runtime/JSNativeStdFunction.h:
• runtime/JSRunLoopTimer.cpp:

(): Deleted.

• runtime/JSRunLoopTimer.h:
• runtime/ProxyObject.h:
• runtime/Watchdog.cpp:

(): Deleted.

• runtime/Watchdog.h:
• wasm/js/WebAssemblyFunction.h:
• wasm/js/WebAssemblyFunctionBase.h:
• wasm/js/WebAssemblyWrapperFunction.h:

Source/WebCore:

No new tests because this patch adds no new functionality.

• html/track/TextTrackCueGeneric.cpp:
• html/track/VTTCue.cpp:
• page/EventHandler.cpp:

(WebCore::SyntheticTouchPoint::SyntheticTouchPoint):

• page/FrameTree.h:
• page/scrolling/ScrollingMomentumCalculator.cpp:

(WebCore::projectedInertialScrollDistance):

• platform/graphics/FontTaggedSettings.h:
• platform/graphics/Region.cpp:
• platform/graphics/filters/FELighting.cpp:
• rendering/TableLayout.h:
• rendering/svg/SVGRenderingContext.h:

Source/WebKit:

• UIProcess/API/APIContentRuleListStore.h:
• WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:

Source/WTF:

Also removed unused lockSpinLimit in Threading.h.

• wtf/MD5.h:
• wtf/SHA1.h:
• wtf/StackBounds.h:
• wtf/Threading.h:

Tools:

• TestWebKitAPI/Tests/WTF/WeakPtr.cpp:

(TestWebKitAPI::TEST):

• TestWebKitAPI/Tests/mac/IsNavigationActionTrusted.mm:

Location:

trunk/Source/JavaScriptCore/interpreter

Files:

• CLoopStack.h (modified) (1 diff)
• CallFrame.h (modified) (2 diffs)
• ShadowChicken.h (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/CLoopStack.h

@@ -47 +47 @@
     public:
         // Allow 8k of excess registers before we start trying to reap the stack
-        static const ptrdiff_t maxExcessCapacity = 8 * 1024;
+        static constexpr ptrdiff_t maxExcessCapacity = 8 * 1024;
 
         CLoopStack(VM&);

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -85 +85 @@
         alignas(CPURegister) CallFrame* callerFrame;
         alignas(CPURegister) const Instruction* returnPC;
-        static const int sizeInRegisters = 2 * sizeof(CPURegister) / sizeof(Register);
+        static constexpr int sizeInRegisters = 2 * sizeof(CPURegister) / sizeof(Register);
     };
     static_assert(CallerFrameAndPC::sizeInRegisters == sizeof(CallerFrameAndPC) / sizeof(Register), "CallerFrameAndPC::sizeInRegisters is incorrect.");
 
     struct CallFrameSlot {
-        static const int codeBlock = CallerFrameAndPC::sizeInRegisters;
-        static const int callee = codeBlock + 1;
-        static const int argumentCount = callee + 1;
-        static const int thisArgument = argumentCount + 1;
-        static const int firstArgument = thisArgument + 1;
+        static constexpr int codeBlock = CallerFrameAndPC::sizeInRegisters;
+        static constexpr int callee = codeBlock + 1;
+        static constexpr int argumentCount = callee + 1;
+        static constexpr int thisArgument = argumentCount + 1;
+        static constexpr int firstArgument = thisArgument + 1;
     };
 
@@ -101 +101 @@
     class CallFrame : private Register {
     public:
-        static const int headerSizeInRegisters = CallFrameSlot::argumentCount + 1;
+        static constexpr int headerSizeInRegisters = CallFrameSlot::argumentCount + 1;
 
         // This function should only be called in very specific circumstances

trunk/Source/JavaScriptCore/interpreter/ShadowChicken.h

@@ -78 +78 @@
         }
         
-        static const constexpr unsigned unlikelyValue = 0x7a11;
-
-        static const constexpr intptr_t tailMarkerValue = static_cast<intptr_t>(unlikelyValue);
+        static constexpr unsigned unlikelyValue = 0x7a11;
+
+        static constexpr intptr_t tailMarkerValue = static_cast<intptr_t>(unlikelyValue);
         static JSObject* tailMarker()
         {