Changeset 161942 in webkit

Timestamp:

Jan 13, 2014 8:51:39 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Gardening: fix bad merge of ​https://bugs.webkit.org/show_bug.cgi?id=126790
on top of ​https://bugs.webkit.org/show_bug.cgi?id=126932.

Not reviewed.

• llint/LowLevelInterpreter.asm:
• the 2 patches implemented the same change in callToJavaScriptPrologue() and callToJavaScriptEpilogue(), but svn merged the changes without reporting a conflict. The result is a redundant push of lr and pop of cfr. This is now fixed.

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (2 diffs)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-13  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: fix bad merge of https://bugs.webkit.org/show_bug.cgi?id=126790
+        on top of https://bugs.webkit.org/show_bug.cgi?id=126932.
+
+        Not reviewed.
+
+        * llint/LowLevelInterpreter.asm:
+        - the 2 patches implemented the same change in callToJavaScriptPrologue()
+          and callToJavaScriptEpilogue(), but svn merged the changes without
+          reporting a conflict. The result is a redundant push of lr and pop of
+          cfr. This is now fixed.
+
 2014-01-13  Mark Lam  <mark.lam@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -315 +315 @@
     elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
         push lr
-        push lr
         push cfr
     end
@@ -332 +331 @@
         popLRAndFP
     elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
-        pop cfr
         pop cfr
         pop lr