Prepare for improved error recovery from compile-time errors.

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

 // Copyright (c) 2016, 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.
 
 library fasta.body_builder;
 
 import '../fasta_codes.dart'
     show
         FastaMessage,
         codeConstFieldWithoutInitializer,
@@ skipping 859 matching lines @@
     String errorName = isSuper ? "super.$name" : name;
     String message;
     if (isGetter) {
       message = "Getter not found: '$errorName'.";
     } else if (isSetter) {
       message = "Setter not found: '$errorName'.";
     } else {
       message = "Method not found: '$errorName'.";
     }
     if (constantExpressionRequired) {
+      // TODO(ahe): Use error below instead of building a compile-time error,
+      // should be:
+      //    return library.loader.throwCompileConstantError(error, charOffset);
       return buildCompileTimeError(message, charOffset);
+    } else {
+      Expression error = library.loader.instantiateNoSuchMethodError(
+          receiver, name, arguments, charOffset,
+          isMethod: !isGetter && !isSetter,
+          isGetter: isGetter,
+          isSetter: isSetter,
+          isStatic: isStatic,
+          isTopLevel: !isStatic && !isSuper);
+      warning(message, charOffset);
+      return new Throw(error);
     }
-    warning(message, charOffset);
-    return new Throw(library.loader.instantiateNoSuchMethodError(
-        receiver, name, arguments, charOffset,
-        isMethod: !isGetter && !isSetter,
-        isGetter: isGetter,
-        isSetter: isSetter,
-        isStatic: isStatic,
-        isTopLevel: !isStatic && !isSuper));
   }
 
   @override
   Expression invokeSuperNoSuchMethod(
       String name, Arguments arguments, int charOffset,
       {bool isGetter: false, bool isSetter: false}) {
     String errorName = "super.$name";
     String message;
     if (isGetter) {
       message = "Getter not found: '$errorName'.";
@@ skipping 1976 matching lines @@
     return super.handleUnrecoverableError(token, message);
   }
 
   @override
   Expression buildCompileTimeError(error, [int charOffset = -1]) {
     // TODO(ahe): This method should be passed the erroneous expression, wrap
     // it in a class (TBD) from which the erroneous expression can be easily
     // extracted. Similar for statements and initializers. See also [issue
     // 29717](https://github.com/dart-lang/sdk/issues/29717)
     addCompileTimeError(charOffset, error);
-    String message = formatUnexpected(uri, charOffset, error);
-    Builder constructor = library.loader.getCompileTimeError();
-    return new Throw(buildStaticInvocation(constructor.target,
-        new KernelArguments(<Expression>[new StringLiteral(message)]),
-        charOffset: charOffset));
+    return library.loader.throwCompileConstantError(library.loader
+        .buildCompileTimeError(
+            formatUnexpected(uri, charOffset, error), charOffset));
   }
 
   Expression wrapInCompileTimeError(Expression expression, String message) {
     return new Let(
         new VariableDeclaration.forValue(expression)
           ..fileOffset = expression.fileOffset,
         buildCompileTimeError(message, expression.fileOffset))
       ..fileOffset = expression.fileOffset;
   }
 
@@ skipping 673 matching lines @@
     if (starToken == null) {
       return AsyncMarker.Async;
     } else {
       assert(identical(starToken.stringValue, "*"));
       return AsyncMarker.AsyncStar;
     }
   } else {
     return internalError("Unknown async modifier: $asyncToken");
   }
 }