DDC changes for Analyzer src/task/strong/info.dart refactor

Review CL: https://codereview.chromium.org/2057373003/

Author: John Messerly

pkg/dev_compiler/lib/src/compiler/code_generator.dart

@@ -21,7 +21,8 @@ import 'package:analyzer/src/generated/type_system.dart'
     show StrongTypeSystemImpl;
 import 'package:analyzer/src/summary/summarize_elements.dart'
     show PackageBundleAssembler;
-import 'package:analyzer/src/task/strong/info.dart' show DynamicInvoke;
+import 'package:analyzer/src/task/strong/ast_properties.dart'
+    show isDynamicInvoke, setIsDynamicInvoke;
 import 'package:source_maps/source_maps.dart';
 import 'package:path/path.dart' show separator;
 
@@ -2729,7 +2730,7 @@ class CodeGenerator extends GeneralizingAstVisitor
       id = lhs.identifier;
     }
 
-    if (target != null && DynamicInvoke.get(target)) {
+    if (target != null && isDynamicInvoke(target)) {
       if (_inWhitelistCode(lhs)) {
         var vars = <JS.MetaLetVariable, JS.Expression>{};
         var l = _visit(_bindValue(vars, 'l', target));
@@ -2868,7 +2869,7 @@ class CodeGenerator extends GeneralizingAstVisitor
     var memberName = _emitMemberName(name, type: type, isStatic: isStatic);
 
     JS.Expression jsTarget = _visit(target);
-    if (DynamicInvoke.get(target) || DynamicInvoke.get(node.methodName)) {
+    if (isDynamicInvoke(target) || isDynamicInvoke(node.methodName)) {
       if (_inWhitelistCode(target)) {
         var vars = <JS.MetaLetVariable, JS.Expression>{};
         var l = _visit(_bindValue(vars, 'l', target));
@@ -2902,7 +2903,7 @@ class CodeGenerator extends GeneralizingAstVisitor
   JS.Expression _emitFunctionCall(InvocationExpression node) {
     var fn = _visit(node.function);
     var args = _visit(node.argumentList) as List<JS.Expression>;
-    if (DynamicInvoke.get(node.function)) {
+    if (isDynamicInvoke(node.function)) {
       var typeArgs = _emitInvokeTypeArguments(node);
       if (typeArgs != null) {
         return js.call('dart.dgcall(#, #, #)',
@@ -3778,7 +3779,7 @@ class CodeGenerator extends GeneralizingAstVisitor
 
     id.staticElement = new TemporaryVariableElement.forNode(id, variable);
     id.staticType = type;
-    DynamicInvoke.set(id, type.isDynamic);
+    setIsDynamicInvoke(id, type.isDynamic);
     addTemporaryVariable(id.staticElement, nullable: nullable);
     return id;
   }
@@ -3852,7 +3853,7 @@ class CodeGenerator extends GeneralizingAstVisitor
       return expr as SimpleIdentifier;
     }
     result.staticType = expr.staticType;
-    DynamicInvoke.set(result, DynamicInvoke.get(expr));
+    setIsDynamicInvoke(result, isDynamicInvoke(expr));
     return result;
   }
 
@@ -4147,7 +4148,7 @@ class CodeGenerator extends GeneralizingAstVisitor
     bool isStatic = member is ClassMemberElement && member.isStatic;
     var name = _emitMemberName(memberName,
         type: getStaticType(target), isStatic: isStatic);
-    if (DynamicInvoke.get(target)) {
+    if (isDynamicInvoke(target)) {
       if (_inWhitelistCode(target)) {
         var vars = <JS.MetaLetVariable, JS.Expression>{};
         var l = _visit(_bindValue(vars, 'l', target));
@@ -4199,7 +4200,7 @@ class CodeGenerator extends GeneralizingAstVisitor
       Expression target, String name, List<Expression> args) {
     var type = getStaticType(target);
     var memberName = _emitMemberName(name, unary: args.isEmpty, type: type);
-    if (DynamicInvoke.get(target)) {
+    if (isDynamicInvoke(target)) {
       if (_inWhitelistCode(target)) {
         var vars = <JS.MetaLetVariable, JS.Expression>{};
         var l = _visit(_bindValue(vars, 'l', target));

pkg/dev_compiler/lib/src/compiler/reify_coercions.dart

@@ -9,8 +9,7 @@ import 'package:analyzer/src/dart/ast/ast.dart' show FunctionBodyImpl;
 import 'package:analyzer/src/dart/ast/utilities.dart' show NodeReplacer;
 import 'package:analyzer/src/dart/element/type.dart' show DynamicTypeImpl;
 import 'package:analyzer/src/generated/parser.dart' show ResolutionCopier;
-import 'package:analyzer/src/task/strong/info.dart'
-    show CoercionInfo, DownCast, DynamicInvoke;
+import 'package:analyzer/src/task/strong/ast_properties.dart' as ast_properties;
 import 'package:logging/logging.dart' as logger;
 
 import 'ast_builder.dart' show AstBuilder, RawAstBuilder;
@@ -29,19 +28,36 @@ class CoercionReifier extends analyzer.GeneralizingAstVisitor<Object> {
   /// explicit coercion nodes in appropriate places.
   static List<CompilationUnit> reify(List<CompilationUnit> units) {
     var cr = new CoercionReifier._();
-    // Clone compilation units, so we don't modify the originals.
-    units = units.map(cr._clone).toList(growable: false);
-    units.forEach(cr.visitCompilationUnit);
-    return units;
+    return units.map(cr.visitCompilationUnit).toList(growable: false);
+  }
+
+  @override
+  CompilationUnit visitCompilationUnit(CompilationUnit node) {
+    if (ast_properties.hasImplicitCasts(node)) {
+      // Clone compilation unit, so we don't modify the originals.
+      node = _clone(node);
+      super.visitCompilationUnit(node);
+    }
+    return node;
   }
 
   @override
   visitExpression(Expression node) {
-    var coercion = CoercionInfo.get(node);
-    if (coercion is DownCast) {
-      return _visitDownCast(coercion, node);
+    node.visitChildren(this);
+
+    var castType = ast_properties.getImplicitCast(node);
+    if (castType != null) {
+      _replaceNode(node.parent, node, _castExpression(node, castType));
     }
-    return super.visitExpression(node);
+  }
+
+  @override
+  visitMethodInvocation(MethodInvocation node) {
+    if (isInlineJS(node.methodName.staticElement)) {
+      // Don't cast our inline-JS code in SDK.
+      ast_properties.setImplicitCast(node, null);
+    }
+    visitExpression(node);
   }
 
   @override
@@ -58,14 +74,13 @@ class CoercionReifier extends analyzer.GeneralizingAstVisitor<Object> {
 
     // If needed, assert a cast inside the body before the variable is read.
     var variable = node.identifier ?? node.loopVariable.identifier;
-    var coercion = CoercionInfo.get(variable);
-    if (coercion is DownCast) {
+    var castType = ast_properties.getImplicitCast(variable);
+    if (castType != null) {
       // Build the cast. We will place this cast in the body, so need to clone
       // the variable's AST node and clear out its static type (otherwise we
       // will optimize away the cast).
       var cast = _castExpression(
-          _clone(variable)..staticType = DynamicTypeImpl.instance,
-          coercion.convertedType);
+          _clone(variable)..staticType = DynamicTypeImpl.instance, castType);
 
       var body = node.body;
       var blockBody = <Statement>[RawAstBuilder.expressionStatement(cast)];
@@ -78,11 +93,6 @@ class CoercionReifier extends analyzer.GeneralizingAstVisitor<Object> {
     }
   }
 
-  void _visitDownCast(DownCast node, Expression expr) {
-    expr.visitChildren(this);
-    _replaceNode(expr.parent, expr, coerceExpression(expr, node));
-  }
-
   void _replaceNode(AstNode parent, AstNode oldNode, AstNode newNode) {
     if (!identical(oldNode, newNode)) {
       var replaced = parent.accept(new NodeReplacer(oldNode, newNode));
@@ -92,19 +102,6 @@ class CoercionReifier extends analyzer.GeneralizingAstVisitor<Object> {
     }
   }
 
-  /// Coerce [e] using [c], returning a new expression.
-  Expression coerceExpression(Expression e, DownCast node) {
-    if (e is NamedExpression) {
-      Expression inner = coerceExpression(e.expression, node);
-      return new NamedExpression(e.name, inner);
-    }
-    if (e is MethodInvocation && isInlineJS(e.methodName.staticElement)) {
-      // Inline JS code should not need casts.
-      return e;
-    }
-    return _castExpression(e, node.convertedType);
-  }
-
   Expression _castExpression(Expression e, DartType toType) {
     // We use an empty name in the AST, because the JS code generator only cares
     // about the target type. It does not look at the AST name.
@@ -124,9 +121,11 @@ class CoercionReifier extends analyzer.GeneralizingAstVisitor<Object> {
 
 class _TreeCloner extends analyzer.AstCloner {
   void _cloneProperties(AstNode clone, AstNode node) {
-    if (clone != null) {
-      CoercionInfo.set(clone, CoercionInfo.get(node));
-      DynamicInvoke.set(clone, DynamicInvoke.get(node));
+    if (clone is Expression) {
+      ast_properties.setImplicitCast(
+          clone, ast_properties.getImplicitCast(node));
+      ast_properties.setIsDynamicInvoke(
+          clone, ast_properties.isDynamicInvoke(node));
     }
   }
 

pkg/dev_compiler/pubspec.lock

@@ -6,7 +6,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.4-alpha.7"
+    version: "0.27.4-alpha.11"
   args:
     description:
       name: args
@@ -54,19 +54,19 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   convert:
     description:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "2.0.0"
   crypto:
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.2+1"
+    version: "2.0.1"
   csslib:
     description:
       name: csslib
@@ -144,7 +144,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.5"
   path:
     description:
       name: path
@@ -168,13 +168,13 @@ packages:
       name: protobuf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.1+2"
+    version: "0.5.1+4"
   pub_semver:
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.4"
+    version: "1.3.0"
   shelf:
     description:
       name: shelf
@@ -210,7 +210,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   stack_trace:
     description:
       name: stack_trace
@@ -222,19 +222,19 @@ packages:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   string_scanner:
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4+1"
+    version: "0.1.5"
   test:
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.13+4"
+    version: "0.12.13+5"
   typed_data:
     description:
       name: typed_data
@@ -264,13 +264,13 @@ packages:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   webdriver:
     description:
       name: webdriver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.8"
+    version: "1.1.1"
   when:
     description:
       name: when
@@ -289,4 +289,4 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.9"
-sdk: ">=1.16.0 <2.0.0"
+sdk: ">=1.17.0-dev.6.2 <1.19.0"

pkg/dev_compiler/pubspec.yaml

@@ -27,11 +27,7 @@ dev_dependencies:
   dart_style: 0.2.4
   test: ^0.12.0
   unittest: ^0.11.6
-  webdriver: ^0.8.8
-
-dependency_overrides:
-  # Remove once there is a package:test that allows 1.18 SDKs in its contraint.
-  test: ^0.12.0
+  webdriver: ^1.1.0
 
 environment:
   sdk: ">=1.12.0 <2.0.0"