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

tests/compiler/dart2js/code_motion_test.dart

Index: tests/compiler/dart2js/code_motion_test.dart
===================================================================
--- tests/compiler/dart2js/code_motion_test.dart	(revision 24017)
+++ tests/compiler/dart2js/code_motion_test.dart	(working copy)
@@ -7,14 +7,16 @@
 
 const String TEST_ONE = r"""
 foo(int a, int b, bool param2) {
+  // Make sure a and b become numbers.
+  var c = a - b;
   for (int i = 0; i < 1; i++) {
-    var x = a + 5;  // '+' is now GVNed.
     if (param2) {
       print(a + b);
     } else {
       print(a + b);
     }
   }
+  return c;
 }
 """;