Change how we deal with manual inlining of argument error and NSM when propagating types. This chan…

sdk/lib/_internal/compiler/implementation/ssa/invoke_dynamic_specializers.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of ssa;
 
 /**
  * [InvokeDynamicSpecializer] and its subclasses are helpers to
  * optimize intercepted dynamic calls. It knows what input types
  * would be beneficial for performance, and how to change a invoke
@@ skipping 22 matching lines @@
           compiler.world.getSideEffectsOfSelector(refined);
     }
     return type;
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     return null;
   }
 
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return false;
+  }
+
   Operation operation(ConstantSystem constantSystem) => null;
 
   static InvokeDynamicSpecializer lookupSpecializer(Selector selector) {
     if (selector.kind == SelectorKind.INDEX) {
       return selector.name == const SourceString('[]')
           ? const IndexSpecializer()
           : const IndexAssignSpecializer();
     } else if (selector.kind == SelectorKind.OPERATOR) {
       if (selector.name == const SourceString('unary-')) {
         return const UnaryNegateSpecializer();
@@ skipping 63 matching lines @@
         // We want the right checked mode error.
         return null;
       }
       return new HIndexAssign(instruction.inputs[1],
                               instruction.inputs[2],
                               instruction.inputs[3],
                               instruction.selector);
     }
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
 }
 
 class IndexSpecializer extends InvokeDynamicSpecializer {
   const IndexSpecializer();
 
   HType computeDesiredTypeForInput(HInvokeDynamic instruction,
                                    HInstruction input,
                                    Compiler compiler) {
     HInstruction index = instruction.inputs[2];
     if (input == instruction.inputs[1] &&
@@ skipping 16 matching lines @@
         return null;
       }
       HInstruction index = new HIndex(
           instruction.inputs[1], instruction.inputs[2], instruction.selector);
       index.instructionType =
           new HType.inferredTypeForSelector(instruction.selector, compiler);
       return index;
     }
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
 }
 
 class BitNotSpecializer extends InvokeDynamicSpecializer {
   const BitNotSpecializer();
 
   UnaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.bitNot;
   }
 
   HType computeDesiredTypeForInput(HInvokeDynamic instruction,
@@ skipping 15 matching lines @@
     if (instruction.inputs[1].isPrimitiveOrNull(compiler)) return HType.INTEGER;
     return super.computeTypeFromInputTypes(instruction, compiler);
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     HInstruction input = instruction.inputs[1];
     if (input.isNumber()) return new HBitNot(input, instruction.selector);
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
 }
 
 class UnaryNegateSpecializer extends InvokeDynamicSpecializer {
   const UnaryNegateSpecializer();
 
   UnaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.negate;
   }
 
   HType computeDesiredTypeForInput(HInvokeDynamic instruction,
@@ skipping 16 matching lines @@
     if (operandType.isNumberOrNull()) return operandType;
     return super.computeTypeFromInputTypes(instruction, compiler);
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     HInstruction input = instruction.inputs[1];
     if (input.isNumber()) return new HNegate(input, instruction.selector);
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
 }
 
 abstract class BinaryArithmeticSpecializer extends InvokeDynamicSpecializer {
   const BinaryArithmeticSpecializer();
 
   HType computeTypeFromInputTypes(HInvokeDynamic instruction,
                                   Compiler compiler) {
     HInstruction left = instruction.inputs[1];
     HInstruction right = instruction.inputs[2];
     if (left.isIntegerOrNull() && right.isIntegerOrNull()) return HType.INTEGER;
@@ skipping 45 matching lines @@
       // Even if there is no builtin equivalent instruction, we know
       // the instruction does not have any side effect, and that it
       // can be GVN'ed.
       instruction.sideEffects.clearAllSideEffects();
       instruction.sideEffects.clearAllDependencies();
       instruction.setUseGvn();
     }
     return null;
   }
 
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
+
   HInstruction newBuiltinVariant(HInvokeDynamic instruction);
 }
 
 class AddSpecializer extends BinaryArithmeticSpecializer {
   const AddSpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.add;
   }
 
@@ skipping 37 matching lines @@
   const ModuloSpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.modulo;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
     // Modulo cannot be mapped to the native operator (different semantics).    
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return false;
+  }
 }
 
 class MultiplySpecializer extends BinaryArithmeticSpecializer {
   const MultiplySpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.multiply;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
@@ skipping 19 matching lines @@
   const TruncatingDivideSpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.truncatingDivide;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
     // Truncating divide does not have a JS equivalent.    
     return null;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return false;
+  }
 }
 
 abstract class BinaryBitOpSpecializer extends BinaryArithmeticSpecializer {
   const BinaryBitOpSpecializer();
 
   HType computeTypeFromInputTypes(HInvokeDynamic instruction,
                                   Compiler compiler) {
     // All bitwise operations on primitive types either produce an
     // integer or throw an error.
     HInstruction left = instruction.inputs[1];
@@ skipping 20 matching lines @@
   const ShiftLeftSpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.shiftLeft;
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     HInstruction left = instruction.inputs[1];
     HInstruction right = instruction.inputs[2];
-    if (!left.isNumber() || !right.isConstantInteger()) return null;
-    HConstant rightConstant = right;
-    IntConstant intConstant = rightConstant.constant;
-    int count = intConstant.value;
-    if (count >= 0 && count <= 31) {
+    if (!left.isNumber()) return null;
+    if (argumentLessThan32(right)) {
       return newBuiltinVariant(instruction);
     }
     return null;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
     return new HShiftLeft(
         instruction.inputs[1], instruction.inputs[2], instruction.selector);
   }
+
+  bool argumentLessThan32(HInstruction instruction) {
+    if (!instruction.isConstantInteger()) return false;
+    HConstant rightConstant = instruction;
+    IntConstant intConstant = rightConstant.constant;
+    int count = intConstant.value;
+    return count >= 0 && count <= 31;
+  }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return argumentLessThan32(instruction.inputs[2]);
+  }
 }
 
 class ShiftRightSpecializer extends BinaryBitOpSpecializer {
   const ShiftRightSpecializer();
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
     // Shift right cannot be mapped to the native operator easily.    
     return null;
   }
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.shiftRight;
   }
+
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
 }
 
 class BitOrSpecializer extends BinaryBitOpSpecializer {
   const BitOrSpecializer();
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.bitOr;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
@@ skipping 59 matching lines @@
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     HInstruction left = instruction.inputs[1];
     HInstruction right = instruction.inputs[2];
     if (left.isNumber() && right.isNumber()) {
       return newBuiltinVariant(instruction);
     }
     return null;
   }
 
+  bool hasBuiltinVariant(HInvokeDynamic instruction, Compiler compiler) {
+    return true;
+  }
+
   HInstruction newBuiltinVariant(HInvokeDynamic instruction);
 }
 
 class EqualsSpecializer extends RelationalSpecializer {
   const EqualsSpecializer();
 
   HType computeDesiredTypeForInput(HInvokeDynamic instruction,
                                    HInstruction input,
                                    Compiler compiler) {
     HInstruction left = instruction.inputs[1];
@@ skipping 95 matching lines @@
 
   BinaryOperation operation(ConstantSystem constantSystem) {
     return constantSystem.lessEqual;
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction) {
     return new HLessEqual(
         instruction.inputs[1], instruction.inputs[2], instruction.selector);
   }
 }