Stop defensively copying AST structures before resolution

[email protected]

Review URL: https://codereview.chromium.org/1383043002 .

Author: bwilkerson

pkg/analysis_server/test/analysis/notification_implemented_test.dart

@@ -37,6 +37,9 @@ class AnalysisNotificationImplementedTest extends AbstractAnalysisTest {
     if (length == -1) {
       length = findIdentifierLength(search);
     }
+    if (implementedClasses == null) {
+      fail('No notification of impemented classes was received');
+    }
     for (ImplementedClass clazz in implementedClasses) {
       if (clazz.offset == offset && clazz.length == length) {
         return;
@@ -57,6 +60,9 @@ class AnalysisNotificationImplementedTest extends AbstractAnalysisTest {
     if (length == -1) {
       length = findIdentifierLength(search);
     }
+    if (implementedMembers == null) {
+      fail('No notification of impemented members was received');
+    }
     for (ImplementedMember member in implementedMembers) {
       if (member.offset == offset && member.length == length) {
         return;
@@ -77,6 +83,9 @@ class AnalysisNotificationImplementedTest extends AbstractAnalysisTest {
     if (length == -1) {
       length = findIdentifierLength(search);
     }
+    if (implementedMembers == null) {
+      fail('No notification of impemented members was received');
+    }
     for (ImplementedMember member in implementedMembers) {
       if (member.offset == offset) {
         fail('Unexpected implemented member at $offset'

pkg/analyzer/lib/src/task/dart.dart

@@ -537,7 +537,7 @@ class BuildCompilationUnitElementTask extends SourceBasedAnalysisTask {
     //
     // Build or reuse CompilationUnitElement.
     //
-    unit = AstCloner.clone(unit);
+//    unit = AstCloner.clone(unit);
     AnalysisCache analysisCache =
         (context as InternalAnalysisContext).analysisCache;
     CompilationUnitElement element =
@@ -573,7 +573,7 @@ class BuildCompilationUnitElementTask extends SourceBasedAnalysisTask {
   static Map<String, TaskInput> buildInputs(AnalysisTarget target) {
     LibrarySpecificUnit unit = target;
     return <String, TaskInput>{
-      PARSED_UNIT_INPUT_NAME: PARSED_UNIT.of(unit.unit)
+      PARSED_UNIT_INPUT_NAME: PARSED_UNIT.of(unit.unit, flushOnAccess: true)
     };
   }
 
@@ -4110,6 +4110,9 @@ class _SourceClosureTaskInputBuilder implements TaskInputBuilder<List<Source>> {
     }
   }
 
+  @override
+  bool get flushOnAccess => false;
+
   @override
   List<Source> get inputValue {
     return _libraries.map((LibraryElement library) => library.source).toList();

pkg/analyzer/lib/src/task/driver.dart

@@ -667,6 +667,9 @@ class WorkItem {
         }
       } else {
         builder.currentValue = inputEntry.getValue(inputResult);
+        if (builder.flushOnAccess) {
+          inputEntry.setState(inputResult, CacheState.FLUSHED);
+        }
       }
       if (!builder.moveNext()) {
         inputs = builder.inputValue;

pkg/analyzer/lib/src/task/inputs.dart

@@ -54,6 +54,9 @@ class ConstantTaskInputBuilder<V> implements TaskInputBuilder<V> {
     throw new StateError('Only supported after moveNext() returns true');
   }
 
+  @override
+  bool get flushOnAccess => false;
+
   @override
   V get inputValue => input.value;
 
@@ -78,7 +81,7 @@ class ListTaskInputImpl<E> extends SimpleTaskInput<List<E>>
    * the given [result] associated with the given [target].
    */
   ListTaskInputImpl(AnalysisTarget target, ResultDescriptor<List<E>> result)
-      : super(target, result);
+      : super._unflushable(target, result);
 }
 
 /**
@@ -288,6 +291,9 @@ class MapToFlattenListTaskInputBuilder<K, V, E>
     currentBuilder.currentValue = value;
   }
 
+  @override
+  bool get flushOnAccess => currentBuilder.flushOnAccess;
+
   @override
   void currentValueNotAvailable() {
     if (currentBuilder == null) {
@@ -439,6 +445,9 @@ class ObjectToListTaskInputBuilder<E> implements TaskInputBuilder<List<E>> {
     builder.currentValue = value;
   }
 
+  @override
+  bool get flushOnAccess => builder.flushOnAccess;
+
   @override
   List<E> get inputValue {
     if (builder != null) {
@@ -490,11 +499,24 @@ class SimpleTaskInput<V> extends TaskInputImpl<V> {
    */
   final ResultDescriptor<V> result;
 
+  /**
+   * Return `true` if the value accessed by this input builder should be flushed
+   * from the cache at the time it is retrieved.
+   */
+  final bool flushOnAccess;
+
+  /**
+   * Initialize a newly created task input that computes the input by accessing
+   * the given [result] associated with the given [target].
+   */
+  SimpleTaskInput(this.target, this.result, {this.flushOnAccess: false});
+
   /**
    * Initialize a newly created task input that computes the input by accessing
    * the given [result] associated with the given [target].
    */
-  SimpleTaskInput(this.target, this.result);
+  SimpleTaskInput._unflushable(this.target, this.result)
+      : flushOnAccess = false;
 
   @override
   TaskInputBuilder<V> createBuilder() => new SimpleTaskInputBuilder<V>(this);
@@ -565,6 +587,9 @@ class SimpleTaskInputBuilder<V> implements TaskInputBuilder<V> {
     _resultSet = true;
   }
 
+  @override
+  bool get flushOnAccess => input.flushOnAccess;
+
   @override
   V get inputValue {
     if (_state != _AFTER) {
@@ -673,6 +698,9 @@ class TopLevelTaskInputBuilder
     currentBuilder.currentValue = value;
   }
 
+  @override
+  bool get flushOnAccess => currentBuilder.flushOnAccess;
+
   @override
   Map<String, Object> get inputValue {
     if (nameIndex < inputNames.length) {
@@ -826,6 +854,9 @@ abstract class _ListToCollectionTaskInputBuilder<B, E, C>
     currentBuilder.currentValue = value;
   }
 
+  @override
+  bool get flushOnAccess => currentBuilder.flushOnAccess;
+
   @override
   C get inputValue {
     if (currentBuilder != null || _resultValue == null) {

pkg/analyzer/lib/src/task/model.dart

@@ -29,8 +29,12 @@ class ListResultDescriptorImpl<E> extends ResultDescriptorImpl<List<E>>
       : super(name, defaultValue, cachingPolicy: cachingPolicy);
 
   @override
-  ListTaskInput<E> of(AnalysisTarget target) =>
-      new ListTaskInputImpl<E>(target, this);
+  ListTaskInput<E> of(AnalysisTarget target, {bool flushOnAccess: false}) {
+    if (flushOnAccess) {
+      throw new StateError('Cannot flush a list of values');
+    }
+    return new ListTaskInputImpl<E>(target, this);
+  }
 }
 
 /**
@@ -71,8 +75,8 @@ class ResultDescriptorImpl<V> implements ResultDescriptor<V> {
   }
 
   @override
-  TaskInput<V> of(AnalysisTarget target) =>
-      new SimpleTaskInput<V>(target, this);
+  TaskInput<V> of(AnalysisTarget target, {bool flushOnAccess: false}) =>
+      new SimpleTaskInput<V>(target, this, flushOnAccess: flushOnAccess);
 
   @override
   String toString() => name;

pkg/analyzer/lib/task/model.dart

@@ -5,6 +5,7 @@
 library analyzer.task.model;
 
 import 'dart:collection';
+import 'dart:developer';
 
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisTask;
 import 'package:analyzer/src/generated/error.dart' show AnalysisError;
@@ -83,6 +84,12 @@ abstract class AnalysisTask {
    */
   static final Map<Type, int> countMap = new HashMap<Type, int>();
 
+  /**
+   * A table mapping the types of analysis tasks to user tags used to collect
+   * timing data for the Observatory.
+   */
+  static Map<Type, UserTag> tagMap = new HashMap<Type, UserTag>();
+
   /**
    * A table mapping the types of analysis tasks to stopwatches used to compute
    * how much time was spent executing each kind of task.
@@ -228,11 +235,15 @@ abstract class AnalysisTask {
       //
       int count = countMap[runtimeType];
       countMap[runtimeType] = count == null ? 1 : count + 1;
+//      UserTag tag = tagMap.putIfAbsent(
+//          runtimeType, () => new UserTag(runtimeType.toString()));
       Stopwatch stopwatch = stopwatchMap[runtimeType];
       if (stopwatch == null) {
         stopwatch = new Stopwatch();
         stopwatchMap[runtimeType] = stopwatch;
       }
+//      UserTag previousTag = tag.makeCurrent();
+//      try {
       stopwatch.start();
       //
       // Actually perform the task.
@@ -245,6 +256,9 @@ abstract class AnalysisTask {
       } finally {
         stopwatch.stop();
       }
+//      } finally {
+//        previousTag.makeCurrent();
+//      }
     } on AnalysisException {
       rethrow;
     } catch (exception, stackTrace) {
@@ -272,7 +286,7 @@ abstract class ListResultDescriptor<E> implements ResultDescriptor<List<E>> {
       E>;
 
   @override
-  ListTaskInput<E> of(AnalysisTarget target);
+  ListTaskInput<E> of(AnalysisTarget target, {bool flushOnAccess: false});
 }
 
 /**
@@ -387,9 +401,10 @@ abstract class ResultDescriptor<V> {
 
   /**
    * Return a task input that can be used to compute this result for the given
-   * [target].
+   * [target]. If [flushOnAccess] is `true` then the value of this result that
+   * is associated with the [target] will be flushed when it is accessed.
    */
-  TaskInput<V> of(AnalysisTarget target);
+  TaskInput<V> of(AnalysisTarget target, {bool flushOnAccess: false});
 }
 
 /**
@@ -529,6 +544,12 @@ abstract class TaskInputBuilder<V> {
    */
   void set currentValue(Object value);
 
+  /**
+   * Return `true` if the value accessed by this input builder should be flushed
+   * from the cache at the time it is retrieved.
+   */
+  bool get flushOnAccess;
+
   /**
    * Return the [value] that was computed by this builder.
    *

pkg/analyzer/test/src/context/context_test.dart

@@ -1500,7 +1500,7 @@ part of lib;
         reason: "part changed 3");
     _analyzeAll_assertFinished();
     expect(context.getResolvedCompilationUnit2(libSource, libSource), isNotNull,
-        reason: "library resolved 2");
+        reason: "library resolved 3");
     expect(
         context.getResolvedCompilationUnit2(partSource, libSource), isNotNull,
         reason: "part resolved 3");