[dart2js] Fix for 37502: double ~/ x returns int

rakudrama · commit-bot@chromium.org · commit 41263a4c1a35 · 2019-07-22T20:54:10.000Z
http://dartbug.com/37502 shows the type-propagation results of ~/ is double instead of int. Bug: 37502 Change-Id: Iec7b8a876a20784c7d2858305eaa67e9d02a63dd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109889 Commit-Queue: Stephen Adams <sra@google.com> Reviewed-by: Mayank Patke <fishythefish@google.com>
diff --git a/pkg/compiler/lib/src/ssa/invoke_dynamic_specializers.dart b/pkg/compiler/lib/src/ssa/invoke_dynamic_specializers.dart
@@ -421,6 +421,15 @@ abstract class BinaryArithmeticSpecializer extends InvokeDynamicSpecializer {
     return null;
   }
 
+  bool inputsAreNum(HInstruction instruction, JClosedWorld closedWorld) {
+    HInstruction left = instruction.inputs[1];
+    HInstruction right = instruction.inputs[2];
+    return left
+            .isNumberOrNull(closedWorld.abstractValueDomain)
+            .isDefinitelyTrue &&
+        right.isNumberOrNull(closedWorld.abstractValueDomain).isDefinitelyTrue;
+  }
+
   bool inputsArePositiveIntegers(
       HInstruction instruction, JClosedWorld closedWorld) {
     HInstruction left = instruction.inputs[1];
@@ -713,6 +722,9 @@ class TruncatingDivideSpecializer extends BinaryArithmeticSpecializer {
     if (inputsArePositiveIntegers(instruction, closedWorld)) {
       return closedWorld.abstractValueDomain.positiveIntType;
     }
+    if (inputsAreNum(instruction, closedWorld)) {
+      return closedWorld.abstractValueDomain.intType;
+    }
     return super.computeTypeFromInputTypes(instruction, results, closedWorld);
   }
 
diff --git a/tests/compiler/dart2js/codegen/tdiv_test.dart b/tests/compiler/dart2js/codegen/tdiv_test.dart
@@ -52,14 +52,26 @@ const String TEST5 = r"""
 foo(param1, param2) {
   var a = param1 ? 0xFFFFFFFF : 0;
   var b = param2 ? 3 : 4;
-  return a ~/ param2;
+  return a ~/ b;
   // We could optimize this with range analysis, but type inference summarizes
   // '3 or 4' to uint31, which is not >= 2.
   // present: '$tdiv'
   // absent: '/'
 }
 """;
 
+const String TEST_REGRESS_37502 = r"""
+foo(param1, param2) {
+  var a = param1 ? 1.2 : 12.3;
+  var b = param2 ? 3.14 : 2.81;
+  return (a ~/ b).gcd(2);
+  // The result of ~/ is int; gcd is defined only on int and is too complex
+  // to be inlined.
+  //
+  // present: 'JSInt_methods.gcd'
+}
+""";
+
 main() {
   runTests() async {
     Future check(String test) {
@@ -71,6 +83,7 @@ main() {
     await check(TEST3);
     await check(TEST4);
     await check(TEST5);
+    await check(TEST_REGRESS_37502);
   }
 
   asyncTest(() async {
