Changeset 254597 in webkit

Timestamp:

Jan 15, 2020, 11:15:05 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r254188. rdar://problem/58553146

AI rule for ValueMod/ValueDiv produce constants with the wrong format when the result can be an int32
​https://bugs.webkit.org/show_bug.cgi?id=205906
<rdar://problem/56108519>

Reviewed by Yusuke Suzuki.

JSTests:

• stress/ai-value-div-should-result-in-constant-int-where-possible.js: Added. (foo.bar.f): (foo.): (foo):
• stress/ai-value-mod-should-result-in-constant-int-where-possible.js: Added. (foo.bar.f): (foo.): (foo):

Source/JavaScriptCore:

The runtime code for ValueMod and ValueDiv produces an int32 when the result
is of int32 value. However, the AI was saying the result is in double format.
This patch fixes AI to produce a JSValue in the right format.

• dfg/DFGAbstractInterpreterInlines.h: (JSC::DFG::AbstractInterpreter<AbstractStateType>::handleConstantDivOp):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/ai-value-div-should-result-in-constant-int-where-possible.js (added)
• JSTests/stress/ai-value-mod-should-result-in-constant-int-where-possible.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (modified) (1 diff)

branches/safari-609-branch/JSTests/ChangeLog

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254188. rdar://problem/58553146
+
+    AI rule for ValueMod/ValueDiv produce constants with the wrong format when the result can be an int32
+    https://bugs.webkit.org/show_bug.cgi?id=205906
+    <rdar://problem/56108519>
+    
+    Reviewed by Yusuke Suzuki.
+    
+    JSTests:
+    
+    * stress/ai-value-div-should-result-in-constant-int-where-possible.js: Added.
+    (foo.bar.f):
+    (foo.):
+    (foo):
+    * stress/ai-value-mod-should-result-in-constant-int-where-possible.js: Added.
+    (foo.bar.f):
+    (foo.):
+    (foo):
+    
+    Source/JavaScriptCore:
+    
+    The runtime code for ValueMod and ValueDiv produces an int32 when the result
+    is of int32 value. However, the AI was saying the result is in double format.
+    This patch fixes AI to produce a JSValue in the right format.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::handleConstantDivOp):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-07  Saam Barati  <sbarati@apple.com>
+
+            AI rule for ValueMod/ValueDiv produce constants with the wrong format when the result can be an int32
+            https://bugs.webkit.org/show_bug.cgi?id=205906
+            <rdar://problem/56108519>
+
+            Reviewed by Yusuke Suzuki.
+
+            * stress/ai-value-div-should-result-in-constant-int-where-possible.js: Added.
+            (foo.bar.f):
+            (foo.):
+            (foo):
+            * stress/ai-value-mod-should-result-in-constant-int-where-possible.js: Added.
+            (foo.bar.f):
+            (foo.):
+            (foo):
+
 2020-01-13  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254188. rdar://problem/58553146
+
+    AI rule for ValueMod/ValueDiv produce constants with the wrong format when the result can be an int32
+    https://bugs.webkit.org/show_bug.cgi?id=205906
+    <rdar://problem/56108519>
+    
+    Reviewed by Yusuke Suzuki.
+    
+    JSTests:
+    
+    * stress/ai-value-div-should-result-in-constant-int-where-possible.js: Added.
+    (foo.bar.f):
+    (foo.):
+    (foo):
+    * stress/ai-value-mod-should-result-in-constant-int-where-possible.js: Added.
+    (foo.bar.f):
+    (foo.):
+    (foo):
+    
+    Source/JavaScriptCore:
+    
+    The runtime code for ValueMod and ValueDiv produces an int32 when the result
+    is of int32 value. However, the AI was saying the result is in double format.
+    This patch fixes AI to produce a JSValue in the right format.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::handleConstantDivOp):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-07  Saam Barati  <sbarati@apple.com>
+
+            AI rule for ValueMod/ValueDiv produce constants with the wrong format when the result can be an int32
+            https://bugs.webkit.org/show_bug.cgi?id=205906
+            <rdar://problem/56108519>
+
+            Reviewed by Yusuke Suzuki.
+
+            The runtime code for ValueMod and ValueDiv produces an int32 when the result
+            is of int32 value. However, the AI was saying the result is in double format.
+            This patch fixes AI to produce a JSValue in the right format.
+
+            * dfg/DFGAbstractInterpreterInlines.h:
+            (JSC::DFG::AbstractInterpreter<AbstractStateType>::handleConstantDivOp):
+
 2020-01-14  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

@@ -324 +324 @@
                 didFoldClobberWorld();
 
-            if (isDivOperation)
-                setConstant(node, jsDoubleNumber(left.asNumber() / right.asNumber()));
-            else
-                setConstant(node, jsDoubleNumber(fmod(left.asNumber(), right.asNumber())));
+            if (isDivOperation) {
+                if (op == ValueDiv)
+                    setConstant(node, jsNumber(left.asNumber() / right.asNumber()));
+                else
+                    setConstant(node, jsDoubleNumber(left.asNumber() / right.asNumber()));
+            } else {
+                if (op == ValueMod)
+                    setConstant(node, jsNumber(fmod(left.asNumber(), right.asNumber())));
+                else
+                    setConstant(node, jsDoubleNumber(fmod(left.asNumber(), right.asNumber())));
+            }
 
             return true;