Changeset 240335 in webkit

Timestamp:

Jan 23, 2019 7:40:55 AM (5 years ago)

Author:

ddkilzer@apple.com

Message:

[JSC] Duplicate global variables: JSC::opcodeLengths
<​https://webkit.org/b/193714>
<rdar://problem/47340200>

Reviewed by Mark Lam.

• bytecode/Opcode.cpp:

(JSC::opcodeLengths): Move array implementation here and mark
const.

• bytecode/Opcode.h:

(JSC::opcodeLengths): Change to extern declaration.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/Opcode.cpp (modified) (1 diff)
• bytecode/Opcode.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-01-23  David Kilzer  <ddkilzer@apple.com>
+
+        [JSC] Duplicate global variables: JSC::opcodeLengths
+        <https://webkit.org/b/193714>
+        <rdar://problem/47340200>
+
+        Reviewed by Mark Lam.
+
+        * bytecode/Opcode.cpp:
+        (JSC::opcodeLengths): Move array implementation here and mark
+        const.
+        * bytecode/Opcode.h:
+        (JSC::opcodeLengths): Change to extern declaration.
+
 2019-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/bytecode/Opcode.cpp

@@ -41 +41 @@
 namespace JSC {
 
+const unsigned opcodeLengths[] = {
+#define OPCODE_LENGTH(opcode, length) length,
+    FOR_EACH_OPCODE_ID(OPCODE_LENGTH)
+#undef OPCODE_LENGTH
+};
+
 const char* const opcodeNames[] = {
 #define OPCODE_NAME_ENTRY(opcode, size) #opcode,

trunk/Source/JavaScriptCore/bytecode/Opcode.h

@@ -72 +72 @@
 #endif
 
-IGNORE_WARNINGS_BEGIN("unused-variable")
-
-#define OPCODE_LENGTH(opcode, length) length,
-    static unsigned opcodeLengths[] = {
-        FOR_EACH_OPCODE_ID(OPCODE_LENGTH)
-    };
-#undef OPCODE_LENGTH
-
-IGNORE_WARNINGS_END
+extern const unsigned opcodeLengths[];
 
 #define OPCODE_ID_LENGTHS(id, length) const int id##_length = length;