Changeset 261441 in webkit

Timestamp:

May 9, 2020 3:40:13 PM (4 years ago)

Author:

Ross Kirsling

Message:

Fix build errors and warnings for non-unified JSCOnly
​https://bugs.webkit.org/show_bug.cgi?id=211655

Reviewed by Darin Adler and Yusuke Suzuki.

• bytecode/BytecodeDumper.cpp:

(JSC::isConstantRegisterIndex): Deleted.
Remove unused function.

• llint/LLIntEntrypoint.cpp:
• llint/LLIntThunks.cpp:
• llint/LLIntThunks.h:
• runtime/AggregateErrorConstructor.cpp:
• runtime/AggregateErrorPrototype.cpp:
• wasm/js/WebAssemblyFunction.cpp:

Fix includes.

• tools/JSDollarVM.cpp:

Deal with "unused constant" warnings for needsDestruction.

• wasm/WasmLLIntPlan.cpp:
• wasm/WasmSignature.cpp:

Remove unused constants.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/BytecodeDumper.cpp (modified) (1 diff)
• llint/LLIntEntrypoint.cpp (modified) (1 diff)
• llint/LLIntThunks.cpp (modified) (1 diff)
• llint/LLIntThunks.h (modified) (1 diff)
• runtime/AggregateErrorConstructor.cpp (modified) (1 diff)
• runtime/AggregateErrorPrototype.cpp (modified) (1 diff)
• tools/JSDollarVM.cpp (modified) (3 diffs)
• wasm/WasmLLIntPlan.cpp (modified) (1 diff)
• wasm/WasmSignature.cpp (modified) (1 diff)
• wasm/js/WebAssemblyFunction.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-05-09  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Fix build errors and warnings for non-unified JSCOnly
+        https://bugs.webkit.org/show_bug.cgi?id=211655
+
+        Reviewed by Darin Adler and Yusuke Suzuki.
+
+        * bytecode/BytecodeDumper.cpp:
+        (JSC::isConstantRegisterIndex): Deleted.
+        Remove unused function.
+
+        * llint/LLIntEntrypoint.cpp:
+        * llint/LLIntThunks.cpp:
+        * llint/LLIntThunks.h:
+        * runtime/AggregateErrorConstructor.cpp:
+        * runtime/AggregateErrorPrototype.cpp:
+        * wasm/js/WebAssemblyFunction.cpp:
+        Fix includes.
+
+        * tools/JSDollarVM.cpp:
+        Deal with "unused constant" warnings for needsDestruction.
+
+        * wasm/WasmLLIntPlan.cpp:
+        * wasm/WasmSignature.cpp:
+        Remove unused constants.
+
 2020-05-08  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp

@@ -50 +50 @@
 namespace JSC {
 
-static ALWAYS_INLINE bool isConstantRegisterIndex(int index)
-{
-    return index >= FirstConstantRegisterIndex;
-}
-
 void BytecodeDumperBase::printLocationAndOp(InstructionStream::Offset location, const char* op)
 {

trunk/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp

@@ -36 +36 @@
 #include "MaxFrameExtentForSlowPathCall.h"
 #include "StackAlignment.h"
-#include "VM.h"
 
 namespace JSC { namespace LLInt {

trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp

@@ -39 +39 @@
 #include "ProtoCallFrame.h"
 #include "StackAlignment.h"
-#include "VM.h"
 #include "WasmCallingConvention.h"
 #include "WasmContextInlines.h"

trunk/Source/JavaScriptCore/llint/LLIntThunks.h

@@ -27 +27 @@
 
 #include "MacroAssemblerCodeRef.h"
+#include "VM.h"
 #include <wtf/Scope.h>
 
 namespace JSC {
 
-class VM;
 struct ProtoCallFrame;
 typedef int64_t EncodedJSValue;

trunk/Source/JavaScriptCore/runtime/AggregateErrorConstructor.cpp

@@ -32 +32 @@
 #include "GCAssertions.h"
 #include "JSCJSValueInlines.h"
-#include "JSCellInlines.h"
+#include "JSGlobalObjectInlines.h"
 #include "RuntimeType.h"
+#include "StructureInlines.h"
 #include "VMInlines.h"
 

trunk/Source/JavaScriptCore/runtime/AggregateErrorPrototype.cpp

@@ -29 +29 @@
 #include "AggregateError.h"
 #include "CallFrame.h"
-#include "Error.h"
 #include "IdentifierInlines.h"
 #include "JSCJSValueInlines.h"
 #include "JSCell.h"
-#include "JSCellInlines.h"
 #include "JSGlobalObjectInlines.h"
-#include "JSObject.h"
+#include "JSObjectInlines.h"
 #include "ThrowScope.h"
 #include "VMInlines.h"

trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

@@ -325 +325 @@
 
     typedef JSNonFinalObject Base;
-    static constexpr bool needsDestruction = false;
     template<typename CellType, SubspaceAccess>
     static CompleteSubspace* subspaceFor(VM& vm)
@@ -536 +535 @@
     static constexpr unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | OverridesGetPropertyNames;
 
+IGNORE_WARNINGS_BEGIN("unused-const-variable")
+    static constexpr bool needsDestruction = false;
+IGNORE_WARNINGS_END
+
     template<typename CellType, SubspaceAccess>
     static CompleteSubspace* subspaceFor(VM& vm)
@@ -560 +563 @@
         static_cast<RuntimeArray*>(cell)->RuntimeArray::~RuntimeArray();
     }
-
-    static constexpr bool needsDestruction = false;
 
     static bool getOwnPropertySlot(JSObject* object, JSGlobalObject* globalObject, PropertyName propertyName, PropertySlot& slot)

trunk/Source/JavaScriptCore/wasm/WasmLLIntPlan.cpp

@@ -41 +41 @@
 namespace JSC { namespace Wasm {
 
-namespace WasmLLIntPlanInternal {
-static const bool verbose = false;
-}
-
 LLIntPlan::LLIntPlan(Context* context, Vector<uint8_t>&& source, AsyncWork work, CompletionTask&& task)
     : Base(context, WTFMove(source), work, WTFMove(task))

trunk/Source/JavaScriptCore/wasm/WasmSignature.cpp

@@ -38 +38 @@
 
 namespace JSC { namespace Wasm {
-
-namespace {
-namespace WasmSignatureInternal {
-static constexpr bool verbose = false;
-}
-}
 
 SignatureInformation* SignatureInformation::theOne { nullptr };

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp

@@ -42 +42 @@
 #include "LinkBuffer.h"
 #include "ProtoCallFrameInlines.h"
-#include "VM.h"
 #include "WasmCallee.h"
 #include "WasmCallingConvention.h"