Revert "Refactor how we read global-type-inference data from ssa"

pkg/compiler/lib/src/ssa/types.dart

Index: pkg/compiler/lib/src/ssa/types.dart
diff --git a/pkg/compiler/lib/src/ssa/types.dart b/pkg/compiler/lib/src/ssa/types.dart
index f43ca7eef6a36ead7004734be48203c328e9cd55..3722bf5c60a4c9549002c7f0700ebc1346e28239 100644
--- a/pkg/compiler/lib/src/ssa/types.dart
+++ b/pkg/compiler/lib/src/ssa/types.dart
@@ -14,18 +14,25 @@ import '../world.dart' show ClassWorld;
 class TypeMaskFactory {
   static TypeMask inferredReturnTypeForElement(
       Element element, Compiler compiler) {
-    return compiler.globalInference.results.returnTypeOf(element) ??
+    return compiler.globalInference.getGuaranteedReturnTypeOfElement(element) ??
         compiler.commonMasks.dynamicType;
   }
 
   static TypeMask inferredTypeForElement(Element element, Compiler compiler) {
-    return compiler.globalInference.results.typeOf(element) ??
+    return compiler.globalInference.getGuaranteedTypeOfElement(element) ??
         compiler.commonMasks.dynamicType;
   }
 
   static TypeMask inferredTypeForSelector(
       Selector selector, TypeMask mask, Compiler compiler) {
-    return compiler.globalInference.results.typeOfSelector(selector, mask) ??
+    return compiler.globalInference
+            .getGuaranteedTypeOfSelector(selector, mask) ??
+        compiler.commonMasks.dynamicType;
+  }
+
+  static TypeMask inferredForNode(
+      Element owner, ast.Node node, Compiler compiler) {
+    return compiler.globalInference.getGuaranteedTypeOfNode(owner, node) ??
         compiler.commonMasks.dynamicType;
   }