Changeset 194385 in webkit

Timestamp:

Dec 22, 2015, 7:22:47 PM (11 years ago)

Author:

fpizlo@apple.com

Message:

REGRESSION(194382): FTL B3 no longer runs V8/encrypt
​https://bugs.webkit.org/show_bug.cgi?id=152519

Reviewed by Saam Barati.

A "Move Imm, Tmp" instruction should turn into "Move32 Imm, Tmp" if the Tmp is spilled to a
32-bit slot. Changing where we check isTmp() achieves this. Since all of the logic is only
relevant to when we spill without introducing a Tmp, and since a Move does not have a "Move Addr,
Addr" form, this code ensures that the logic only happens for "Tmp, Tmp" and "Imm, Tmp".

• b3/air/AirIteratedRegisterCoalescing.cpp:
• dfg/DFGOperations.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/air/AirIteratedRegisterCoalescing.cpp (modified) (1 diff)
• dfg/DFGOperations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-12-22  Filip Pizlo  <fpizlo@apple.com>
+
+        REGRESSION(194382): FTL B3 no longer runs V8/encrypt
+        https://bugs.webkit.org/show_bug.cgi?id=152519
+
+        Reviewed by Saam Barati.
+
+        A "Move Imm, Tmp" instruction should turn into "Move32 Imm, Tmp" if the Tmp is spilled to a
+        32-bit slot. Changing where we check isTmp() achieves this. Since all of the logic is only
+        relevant to when we spill without introducing a Tmp, and since a Move does not have a "Move Addr,
+        Addr" form, this code ensures that the logic only happens for "Tmp, Tmp" and "Imm, Tmp".
+
+        * b3/air/AirIteratedRegisterCoalescing.cpp:
+        * dfg/DFGOperations.cpp:
+
 2015-12-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp

@@ -1191 +1191 @@
                 bool forceMove32IfDidSpill = false;
                 bool didSpill = false;
-                if (type == Arg::GP && inst.opcode == Move
-                    && inst.args[0].isTmp() && inst.args[1].isTmp()) {
-                    if (m_tmpWidth.defWidth(inst.args[0].tmp()) <= Arg::Width32
-                        || m_tmpWidth.useWidth(inst.args[1].tmp()) <= Arg::Width32)
+                if (type == Arg::GP && inst.opcode == Move) {
+                    if ((inst.args[0].isTmp() && m_tmpWidth.defWidth(inst.args[0].tmp()) <= Arg::Width32)
+                        || (inst.args[1].isTmp() && m_tmpWidth.useWidth(inst.args[1].tmp()) <= Arg::Width32))
                         forceMove32IfDidSpill = true;
                 }

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -1253 +1253 @@
     NativeCallFrameTracer tracer(&vm, exec);
 
-    dataLog("Ran the barrier.\n");
-
     return bitwise_cast<char*>(jsCast<JSObject*>(cell)->butterfly());
 }