Changeset 146831 in webkit for trunk/Source/JavaScriptCore/offlineasm/cloop.rb

Timestamp:

Mar 25, 2013, 5:36:18 PM (12 years ago)

Author:

[email protected]

Message:

Offlineasm cloop backend compiles op+branch incorrectly.
​https://bugs.webkit.org/show_bug.cgi?id=113146.

Reviewed by Geoffrey Garen.

• dfg/DFGRepatch.h:

(JSC::DFG::dfgResetGetByID):
(JSC::DFG::dfgResetPutByID):

• These functions never return when the DFG is dsiabled, not just when asserts are enabled. Changing the attribute from NO_RETURN_DUE_TO_ASSERT to NO_RETURN.
• llint/LLIntOfflineAsmConfig.h:
• Added some #defines needed to get the cloop building again.
• offlineasm/cloop.rb:
• Fix cloopEmitOpAndBranchIfOverflow() and cloopEmitOpAndBranch() to emit code that unconditionally executes the specified operation before doing the conditional branch.

File:

• trunk/Source/JavaScriptCore/offlineasm/cloop.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/offlineasm/cloop.rb

@@ -466 +466 @@
     $asm.putc "{"
     $asm.putc "    #{tempType} temp = #{op2} #{operator} #{op1};"
+    $asm.putc "    #{op2} = temp;"
     $asm.putc "    if (temp #{conditionTest})"
     $asm.putc "        goto  #{operands[2].cLabel};"
-    $asm.putc "    #{op2} = temp;"
     $asm.putc "}"
 end
@@ -534 +534 @@
     end
 
-    $asm.putc "    if #{overflowTest} {"
+    $asm.putc "    bool didOverflow = #{overflowTest};"
+    $asm.putc "    #{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};"
+    $asm.putc "    if (didOverflow)"
     $asm.putc "        goto #{operands[2].cLabel};"
-    $asm.putc "    }"
-    $asm.putc "    #{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};"
     $asm.putc "}"
 end