Title: [240526] branches/safari-607-branch
- Revision
- 240526
- Author
- [email protected]
- Date
- 2019-01-25 16:02:43 -0800 (Fri, 25 Jan 2019)
Log Message
Cherry-pick r240335. rdar://problem/47494779
2019-01-23 David Kilzer <[email protected]>
[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.
Modified Paths
Property Changed
Diff
Index: branches/safari-607-branch
===================================================================
--- branches/safari-607-branch 2019-01-25 23:52:51 UTC (rev 240525)
+++ branches/safari-607-branch 2019-01-26 00:02:43 UTC (rev 240526)
Property changes: branches/safari-607-branch
Modified: svn:mergeinfo
-/trunk:53455,239940,240329
\ No newline at end of property
+/trunk:53455,239940,240329,240335
\ No newline at end of property
Modified: branches/safari-607-branch/Source/_javascript_Core/ChangeLog (240525 => 240526)
--- branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-01-25 23:52:51 UTC (rev 240525)
+++ branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-01-26 00:02:43 UTC (rev 240526)
@@ -1,5 +1,23 @@
2019-01-25 Mark Lam <[email protected]>
+ Cherry-pick r240335. rdar://problem/47494779
+
+ 2019-01-23 David Kilzer <[email protected]>
+
+ [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-25 Mark Lam <[email protected]>
+
Cherry-pick r240329. rdar://problem/47458354
This is for a follow up fix that was missed in the cherry-pick for rdar://problem/47458354.
Modified: branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.cpp (240525 => 240526)
--- branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.cpp 2019-01-25 23:52:51 UTC (rev 240525)
+++ branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.cpp 2019-01-26 00:02:43 UTC (rev 240526)
@@ -40,6 +40,12 @@
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,
FOR_EACH_OPCODE_ID(OPCODE_NAME_ENTRY)
Modified: branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.h (240525 => 240526)
--- branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.h 2019-01-25 23:52:51 UTC (rev 240525)
+++ branches/safari-607-branch/Source/_javascript_Core/bytecode/Opcode.h 2019-01-26 00:02:43 UTC (rev 240526)
@@ -71,16 +71,8 @@
#undef OPCODE_ID_ENUM
#endif
-IGNORE_WARNINGS_BEGIN("unused-variable")
+extern const unsigned opcodeLengths[];
-#define OPCODE_LENGTH(opcode, length) length,
- static unsigned opcodeLengths[] = {
- FOR_EACH_OPCODE_ID(OPCODE_LENGTH)
- };
-#undef OPCODE_LENGTH
-
-IGNORE_WARNINGS_END
-
#define OPCODE_ID_LENGTHS(id, length) const int id##_length = length;
FOR_EACH_OPCODE_ID(OPCODE_ID_LENGTHS);
#undef OPCODE_ID_LENGTHS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
