Associate compile-time errors with elements

pkg/compiler/lib/src/compiler.dart

 // Copyright (c) 2012, 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 dart2js.compiler_base;
 
 import 'dart:async' show
     EventSink,
     Future;
 
@@ skipping 328 matching lines @@
   /// The [int.fromEnvironment] constructor.
   ConstructorElement intEnvironment;
 
   /// The [bool.fromEnvironment] constructor.
   ConstructorElement boolEnvironment;
 
   /// The [String.fromEnvironment] constructor.
   ConstructorElement stringEnvironment;
 
   /// Tracks elements with compile-time errors.
-  final Set<Element> elementsWithCompileTimeErrors = new Set<Element>();
+  final Map<Element, DiagnosticMessage> elementsWithCompileTimeErrors =
+      new Map<Element, DiagnosticMessage>();
 
   fromEnvironment(String name) => null;
 
   Element get currentElement => _reporter.currentElement;
 
   List<CompilerTask> tasks;
   ScannerTask scanner;
   DietParserTask dietParser;
   ParserTask parser;
   PatchParserTask patchParser;
@@ skipping 41 matching lines @@
   bool get shouldPrintProgress {
     return verbose && progress.elapsedMilliseconds > 500;
   }
 
   static const int PHASE_SCANNING = 0;
   static const int PHASE_RESOLVING = 1;
   static const int PHASE_DONE_RESOLVING = 2;
   static const int PHASE_COMPILING = 3;
   int phase;
 
-  bool compilationFailedInternal = false;
-
-  bool get compilationFailed => compilationFailedInternal;
-
-  void set compilationFailed(bool value) {
-    if (value) {
-      elementsWithCompileTimeErrors.add(currentElement);
-    }
-    compilationFailedInternal = value;
-  }
+  bool compilationFailed = false;
 
   /// Set by the backend if real reflection is detected in use of dart:mirrors.
   bool disableTypeInferenceForMirrors = false;
 
   Compiler({this.enableTypeAssertions: false,
             this.enableUserAssertions: false,
             this.trustTypeAnnotations: false,
             this.trustPrimitives: false,
             bool disableTypeInferenceFlag: false,
             this.maxConcreteTypeSize: 5,
@@ skipping 985 matching lines @@
     enqueuer.forgetElement(element);
     if (element is MemberElement) {
       for (Element closure in element.nestedClosures) {
         // TODO(ahe): It would be nice to reuse names of nested closures.
         closureToClassMapper.forgetElement(closure);
       }
     }
     backend.forgetElement(element);
   }
 
+  /// Returns [true] if a compile-time error has been reported for element.
+  ///
+  /// This function should only be called when
+  /// [generateCodeWithCompileTimeErrors] is true.
   bool elementHasCompileTimeError(Element element) {
-    return elementsWithCompileTimeErrors.contains(element);
+    assert(generateCodeWithCompileTimeErrors);

[Johnni Winther, 2015/12/14 11:31:20]

Change the approach to only store message when
[generateCodeWithCompileTimeErrors] is true.

[sigurdm, 2015/12/14 12:07:43]

Done.

+    return elementsWithCompileTimeErrors.containsKey(element);
   }
 
   EventSink<String> outputProvider(String name, String extension) {
     if (compilationFailed) {
       if (!generateCodeWithCompileTimeErrors || testMode) {
         // Disable output in test mode: The build bot currently uses the time
         // stamp of the generated file to determine whether the output is
         // up-to-date.
         return new NullSink('$name.$extension');
       }
@@ skipping 248 matching lines @@
     reportDiagnostic(message, infos, kind);
   }
 
   void reportDiagnostic(DiagnosticMessage message,
                         List<DiagnosticMessage> infos,
                         api.Diagnostic kind) {
     if (kind == api.Diagnostic.ERROR ||
         kind == api.Diagnostic.CRASH ||
         (options.fatalWarnings &&
          kind == api.Diagnostic.WARNING)) {
+      compiler.elementsWithCompileTimeErrors[currentElement] = message;
       compiler.compilationFailed = true;
     }
     compiler.reportDiagnostic(message, infos, kind);
   }
 
   /**
    * Perform an operation, [f], returning the return value from [f].  If an
    * error occurs then report it as having occurred during compilation of
    * [element].  Can be nested.
    */
@@ skipping 371 matching lines @@
     if (_otherDependencies == null) {
       _otherDependencies = new Setlet<Element>();
     }
     _otherDependencies.add(element.implementation);
   }
 
   Iterable<Element> get otherDependencies {
     return _otherDependencies != null ? _otherDependencies : const <Element>[];
   }
 }