Less direct Compiler use in SSA

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

Index: pkg/compiler/lib/src/ssa/type_builder.dart
diff --git a/pkg/compiler/lib/src/ssa/type_builder.dart b/pkg/compiler/lib/src/ssa/type_builder.dart
index 5724e107ed2824759d64de5217f5eb9cc80d163e..13c724f23bbe2ed76923586463ea6815e3dc785a 100644
--- a/pkg/compiler/lib/src/ssa/type_builder.dart
+++ b/pkg/compiler/lib/src/ssa/type_builder.dart
@@ -21,7 +21,7 @@ class TypeBuilder {
 
   /// Create an instruction to simply trust the provided type.
   HInstruction _trustType(HInstruction original, ResolutionDartType type) {
-    assert(builder.compiler.options.trustTypeAnnotations);
+    assert(builder.options.trustTypeAnnotations);
     assert(type != null);
     type = builder.localsHandler.substInContext(type);
     type = type.unaliased;
@@ -38,7 +38,7 @@ class TypeBuilder {
   /// by attempting a type conversion.
   HInstruction _checkType(
       HInstruction original, ResolutionDartType type, int kind) {
-    assert(builder.compiler.options.enableTypeAssertions);
+    assert(builder.options.enableTypeAssertions);
     assert(type != null);
     type = builder.localsHandler.substInContext(type);
     HInstruction other = buildTypeConversion(original, type, kind);
@@ -59,9 +59,9 @@ class TypeBuilder {
       {int kind: HTypeConversion.CHECKED_MODE_CHECK}) {
     if (type == null) return original;
     HInstruction checkedOrTrusted = original;
-    if (builder.compiler.options.trustTypeAnnotations) {
+    if (builder.options.trustTypeAnnotations) {
       checkedOrTrusted = _trustType(original, type);
-    } else if (builder.compiler.options.enableTypeAssertions) {
+    } else if (builder.options.enableTypeAssertions) {
       checkedOrTrusted = _checkType(original, type, kind);
     }
     if (checkedOrTrusted == original) return original;
@@ -124,7 +124,7 @@ class TypeBuilder {
       return readTypeVariable(type, member,
           sourceInformation: sourceInformation);
     } else {
-      builder.compiler.reporter.internalError(
+      builder.reporter.internalError(
           type.element, 'Unexpected type variable in static context.');
       return null;
     }
@@ -218,8 +218,8 @@ class TypeBuilder {
   }
 
   bool get checkOrTrustTypes =>
-      builder.compiler.options.enableTypeAssertions ||
-      builder.compiler.options.trustTypeAnnotations;
+      builder.options.enableTypeAssertions ||
+      builder.options.trustTypeAnnotations;
 
   /// Build a [HTypeConversion] for converting [original] to type [type].
   ///