More unit test fixes after IR returns different int types for inferrer.

tests/compiler/dart2js/simple_inferrer_test.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.
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import
     '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
     show TypeMask;
 
@@ skipping 749 matching lines @@
     checkReturn('testIsCheck26', intType);
     checkReturn('testIsCheck27', intType);
     checkReturn('testIsCheck28', typesTask.dynamicType);
     checkReturn('testIsCheck29', typesTask.dynamicType);
     checkReturn('testIf1', typesTask.uint31Type.nullable());
     checkReturn('testIf2', typesTask.uint31Type.nullable());
     checkReturn('returnAsString',
         new TypeMask.subtype(compiler.stringClass));
     checkReturn('returnIntAsNum', typesTask.uint31Type);
     checkReturn('returnAsTypedef', typesTask.functionType.nullable());
-    checkReturn('returnTopLevelGetter', typesTask.intType);
-    checkReturn('testDeadCode', typesTask.intType);
+    checkReturn('returnTopLevelGetter', typesTask.uint31Type);
+    checkReturn('testDeadCode', typesTask.uint31Type);
     checkReturn('testLabeledIf', typesTask.uint31Type.nullable());
     checkReturn('testSwitch1', typesTask.intType
         .union(typesTask.doubleType, compiler)
         .nullable().simplify(compiler));
     checkReturn('testSwitch2', typesTask.uint31Type);
     checkReturn('testSwitch3', interceptorType.nullable());
     checkReturn('testSwitch4', typesTask.uint31Type);
     checkReturn('testSwitch5', typesTask.uint31Type);
     checkReturn('testContinue1', interceptorType.nullable());
     checkReturn('testBreak1', interceptorType.nullable());
     checkReturn('testContinue2', interceptorType.nullable());
     checkReturn('testBreak2', typesTask.intType.nullable());
     checkReturn('testReturnElementOfConstList1', typesTask.uint31Type);
     checkReturn('testReturnElementOfConstList2', typesTask.uint31Type);
     checkReturn('testReturnItselfOrInt', typesTask.uint31Type);
     checkReturn('testReturnInvokeDynamicGetter', typesTask.dynamicType);
 
     checkReturn('testDoWhile1', typesTask.stringType);
     checkReturn('testDoWhile2', typesTask.nullType);
     checkReturn('testDoWhile3', typesTask.uint31Type);
     checkReturn('testDoWhile4', typesTask.numType);
 
     checkReturnInClass(String className, String methodName, type) {
       var cls = findElement(compiler, className);
       var element = cls.lookupLocalMember(methodName);
       Expect.equals(type,
-          typesInferrer.getReturnTypeOfElement(element).simplify(compiler));
+          typesInferrer.getReturnTypeOfElement(element).simplify(compiler),
+          '$className:$methodName');
     }
 
     checkReturnInClass('A', 'returnInt1', typesTask.intType);
     checkReturnInClass('A', 'returnInt2', typesTask.intType);
     checkReturnInClass('A', 'returnInt3', typesTask.intType);
     checkReturnInClass('A', 'returnInt4', typesTask.intType);
     checkReturnInClass('A', 'returnInt5', typesTask.intType);
     checkReturnInClass('A', 'returnInt6', typesTask.intType);
     checkReturnInClass('A', '==', interceptorType);
 
     checkReturnInClass('B', 'returnInt1', typesTask.intType);
     checkReturnInClass('B', 'returnInt2', typesTask.intType);
     checkReturnInClass('B', 'returnInt3', typesTask.intType);
     checkReturnInClass('B', 'returnInt4', typesTask.intType);
     checkReturnInClass('B', 'returnInt5', typesTask.intType);
     checkReturnInClass('B', 'returnInt6', typesTask.intType);
     checkReturnInClass('B', 'returnInt7', typesTask.intType);
     checkReturnInClass('B', 'returnInt8', typesTask.intType);
-    checkReturnInClass('B', 'returnInt9', typesTask.intType);
+    checkReturnInClass('B', 'returnInt9', typesTask.uint31Type);
 
     checkFactoryConstructor(String className, String factoryName) {
       var cls = findElement(compiler, className);
       var element = cls.localLookup(factoryName);
       Expect.equals(new TypeMask.nonNullExact(cls),
                     typesInferrer.getReturnTypeOfElement(element));
     }
     checkFactoryConstructor('A', '');
 
     checkReturn('testCascade1', typesTask.growableListType);
     checkReturn('testCascade2', new TypeMask.nonNullExact(
         findElement(compiler, 'CascadeHelper')));
     checkReturn('testSpecialization1', typesTask.numType);
     checkReturn('testSpecialization2', typesTask.dynamicType);
     checkReturn('testSpecialization3', typesTask.uint31Type.nullable());
     checkReturn('testReturnNull1', typesTask.nullType);
     checkReturn('testReturnNull2', typesTask.nullType);
     checkReturn('testReturnNull3', typesTask.dynamicType);
     checkReturn('testReturnNull4', typesTask.nullType);
     checkReturn('testReturnNull5', typesTask.nullType);
     checkReturn('testReturnNull6', typesTask.dynamicType);
   }));
 }