Merge branch 'master' of github.com:TheBosZ/dev_compiler

Author: Nathan Kerr

pkg/dev_compiler/lib/runtime/dart_sdk.js

@@ -119,6 +119,11 @@ class CodeGenerator extends GeneralizingAstVisitor
 
   String _buildRoot;
 
+  bool _superAllowed = true;
+
+  List<JS.TemporaryId> _superHelperSymbols = <JS.TemporaryId>[];
+  List<JS.Method> _superHelpers = <JS.Method>[];
+
   /// Whether we are currently generating code for the body of a `JS()` call.
   bool _isInForeignJS = false;
 
@@ -596,6 +601,7 @@ class CodeGenerator extends GeneralizingAstVisitor
     var body = <JS.Statement>[];
     var extensions = _extensionsToImplement(classElem);
     _initExtensionSymbols(classElem, methods, fields, body);
+    _emitSuperHelperSymbols(_superHelperSymbols, body);
 
     // Emit the class, e.g. `core.Object = class Object { ... }`
     _defineClass(classElem, className, classExpr, body);
@@ -620,6 +626,14 @@ class CodeGenerator extends GeneralizingAstVisitor
     return _statement(body);
   }
 
+  void _emitSuperHelperSymbols(
+      List<JS.TemporaryId> superHelperSymbols, List<JS.Statement> body) {
+    for (var id in superHelperSymbols) {
+      body.add(js.statement('const # = Symbol(#)', [id, js.string(id.name)]));
+    }
+    superHelperSymbols.clear();
+  }
+
   void _registerPropertyOverrides(
       ClassElement classElem,
       JS.Expression className,
@@ -898,6 +912,10 @@ class CodeGenerator extends GeneralizingAstVisitor
       jsMethods.add(_emitIterable(type));
     }
 
+    // Add all of the super helper methods
+    jsMethods.addAll(_superHelpers);
+    _superHelpers.clear();
+
     return jsMethods.where((m) => m != null).toList(growable: false);
   }
 
@@ -1631,7 +1649,7 @@ class CodeGenerator extends GeneralizingAstVisitor
     }
   }
 
-  JS.Method _emitMethodDeclaration(DartType type, MethodDeclaration node) {
+  JS.Method _emitMethodDeclaration(InterfaceType type, MethodDeclaration node) {
     if (node.isAbstract) {
       return null;
     }
@@ -1957,8 +1975,11 @@ class CodeGenerator extends GeneralizingAstVisitor
     } else {
       _asyncStarController = null;
     }
+    var savedSuperAllowed = _superAllowed;
+    _superAllowed = false;
     // Visit the body with our async* controller set.
     var jsBody = _visit(body);
+    _superAllowed = savedSuperAllowed;
     _asyncStarController = savedController;
 
     DartType returnType = _getExpectedReturnType(element);
@@ -2004,8 +2025,12 @@ class CodeGenerator extends GeneralizingAstVisitor
   /// function instantiation.
   @override
   JS.Expression visitSimpleIdentifier(SimpleIdentifier node) {
-    return _applyFunctionTypeArguments(
-        _emitSimpleIdentifier(node), node.staticElement, node.staticType);
+    var typeArgs = _getTypeArgs(node.staticElement, node.staticType);
+    var simpleId = _emitSimpleIdentifier(node);
+    if (typeArgs == null) {
+      return simpleId;
+    }
+    return js.call('dart.gbind(#, #)', [simpleId, typeArgs]);
   }
 
   /// Emits a simple identifier, handling implicit `this` as well as
@@ -2385,17 +2410,66 @@ class CodeGenerator extends GeneralizingAstVisitor
     return _emitMethodCall(target, node);
   }
 
-  /// Emits a (possibly generic) instance method call.
   JS.Expression _emitMethodCall(Expression target, MethodInvocation node) {
+    List<JS.Expression> args = _visit(node.argumentList);
+    var typeArgs = _emitInvokeTypeArguments(node);
+
+    if (target is SuperExpression && !_superAllowed) {
+      return _emitSuperHelperCall(typeArgs, args, target, node);
+    }
+
+    return _emitMethodCallInternal(target, node, args, typeArgs);
+  }
+
+  JS.Expression _emitSuperHelperCall(List<JS.Expression> typeArgs,
+      List<JS.Expression> args, SuperExpression target, MethodInvocation node) {
+    var fakeTypeArgs =
+        typeArgs?.map((_) => new JS.TemporaryId('a'))?.toList(growable: false);
+    var fakeArgs =
+        args.map((_) => new JS.TemporaryId('a')).toList(growable: false);
+    var combinedFakeArgs = <JS.TemporaryId>[];
+    if (fakeTypeArgs != null) {
+      combinedFakeArgs.addAll(fakeTypeArgs);
+    }
+    combinedFakeArgs.addAll(fakeArgs);
+
+    var forwardedCall =
+        _emitMethodCallInternal(target, node, fakeArgs, fakeTypeArgs);
+    var superForwarder = _getSuperHelperFor(
+        node.methodName.name, forwardedCall, combinedFakeArgs);
+
+    var combinedRealArgs = <JS.Expression>[];
+    if (typeArgs != null) {
+      combinedRealArgs.addAll(typeArgs);
+    }
+    combinedRealArgs.addAll(args);
+
+    return js.call('this.#(#)', [superForwarder, combinedRealArgs]);
+  }
+
+  JS.Expression _getSuperHelperFor(String name, JS.Expression forwardedCall,
+      List<JS.Expression> helperArgs) {
+    var helperMethod =
+        new JS.Fun(helperArgs, new JS.Block([new JS.Return(forwardedCall)]));
+    var helperMethodName = new JS.TemporaryId('super\$$name');
+    _superHelperSymbols.add(helperMethodName);
+    _superHelpers.add(new JS.Method(helperMethodName, helperMethod));
+    return helperMethodName;
+  }
+
+  /// Emits a (possibly generic) instance method call.
+  JS.Expression _emitMethodCallInternal(
+      Expression target,
+      MethodInvocation node,
+      List<JS.Expression> args,
+      List<JS.Expression> typeArgs) {
     var type = getStaticType(target);
     var name = node.methodName.name;
     var element = node.methodName.staticElement;
     bool isStatic = element is ExecutableElement && element.isStatic;
     var memberName = _emitMemberName(name, type: type, isStatic: isStatic);
 
     JS.Expression jsTarget = _visit(target);
-    var typeArgs = _emitInvokeTypeArguments(node);
-    List<JS.Expression> args = _visit(node.argumentList);
     if (DynamicInvoke.get(target)) {
       if (typeArgs != null) {
         return js.call('dart.dgsend(#, #, #, #)',
@@ -2411,6 +2485,7 @@ class CodeGenerator extends GeneralizingAstVisitor
     }
 
     jsTarget = new JS.PropertyAccess(jsTarget, memberName);
+
     if (typeArgs != null) jsTarget = new JS.Call(jsTarget, typeArgs);
 
     if (DynamicInvoke.get(node.methodName)) {
@@ -3545,8 +3620,45 @@ class CodeGenerator extends GeneralizingAstVisitor
     if (member is PropertyAccessorElement) {
       member = (member as PropertyAccessorElement).variable;
     }
+    String memberName = memberId.name;
+    var typeArgs = _getTypeArgs(member, resultType);
+
+    if (target is SuperExpression && !_superAllowed) {
+      return _emitSuperHelperAccess(target, member, memberName, typeArgs);
+    }
+    return _emitAccessInternal(target, member, memberName, typeArgs);
+  }
+
+  JS.Expression _emitSuperHelperAccess(SuperExpression target, Element member,
+      String memberName, List<JS.Expression> typeArgs) {
+    var fakeTypeArgs =
+        typeArgs?.map((_) => new JS.TemporaryId('a'))?.toList(growable: false);
+
+    var forwardedAccess =
+        _emitAccessInternal(target, member, memberName, fakeTypeArgs);
+    var superForwarder = _getSuperHelperFor(
+        memberName, forwardedAccess, fakeTypeArgs ?? const []);
+
+    return js.call('this.#(#)', [superForwarder, typeArgs ?? const []]);
+  }
+
+  List<JS.Expression> _getTypeArgs(Element member, DartType instantiated) {
+    DartType type;
+    if (member is ExecutableElement) {
+      type = member.type;
+    } else if (member is VariableElement) {
+      type = member.type;
+    }
+
+    // TODO(jmesserly): handle explicitly passed type args.
+    if (type == null) return null;
+    return _emitFunctionTypeArguments(type, instantiated);
+  }
+
+  JS.Expression _emitAccessInternal(Expression target, Element member,
+      String memberName, List<JS.Expression> typeArgs) {
     bool isStatic = member is ClassMemberElement && member.isStatic;
-    var name = _emitMemberName(memberId.name,
+    var name = _emitMemberName(memberName,
         type: getStaticType(target), isStatic: isStatic);
     if (DynamicInvoke.get(target)) {
       return js.call('dart.dload(#, #)', [_visit(target), name]);
@@ -3566,34 +3678,19 @@ class CodeGenerator extends GeneralizingAstVisitor
       // Tear-off methods: explicitly bind it.
       if (isSuper) {
         result = js.call('dart.bind(this, #, #.#)', [name, jsTarget, name]);
-      } else if (_isObjectMemberCall(target, memberId.name)) {
+      } else if (_isObjectMemberCall(target, memberName)) {
         result = js.call('dart.bind(#, #, dart.#)', [jsTarget, name, name]);
       } else {
         result = js.call('dart.bind(#, #)', [jsTarget, name]);
       }
-    } else if (_isObjectMemberCall(target, memberId.name)) {
+    } else if (_isObjectMemberCall(target, memberName)) {
       result = js.call('dart.#(#)', [name, jsTarget]);
     } else {
       result = js.call('#.#', [jsTarget, name]);
     }
-    return _applyFunctionTypeArguments(result, member, resultType);
-  }
-
-  /// If this is an inferred instantiation of a generic function/method, this
-  /// will add the inferred type arguments.
-  JS.Expression _applyFunctionTypeArguments(
-      JS.Expression result, Element member, DartType instantiated) {
-    DartType type;
-    if (member is ExecutableElement) {
-      type = member.type;
-    } else if (member is VariableElement) {
-      type = member.type;
+    if (typeArgs == null) {
+      return result;
     }
-
-    // TODO(jmesserly): handle explicitly passed type args.
-    if (type == null) return result;
-    var typeArgs = _emitFunctionTypeArguments(type, instantiated);
-    if (typeArgs == null) return result;
     return js.call('dart.gbind(#, #)', [result, typeArgs]);
   }
 
@@ -3791,8 +3888,12 @@ class CodeGenerator extends GeneralizingAstVisitor
 
   @override
   visitTryStatement(TryStatement node) {
-    return new JS.Try(_visit(node.body), _visitCatch(node.catchClauses),
-        _visit(node.finallyBlock));
+    var savedSuperAllowed = _superAllowed;
+    _superAllowed = false;
+    var finallyBlock = _visit(node.finallyBlock);
+    _superAllowed = savedSuperAllowed;
+    return new JS.Try(
+        _visit(node.body), _visitCatch(node.catchClauses), finallyBlock);
   }
 
   _visitCatch(NodeList<CatchClause> clauses) {

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

@@ -24,10 +24,12 @@ class CompileCommand extends Command {
   CompileCommand({MessageHandler messageHandler})
       : this.messageHandler = messageHandler ?? print {
     argParser.addOption('out', abbr: 'o', help: 'Output file (required)');
+    argParser.addOption('module-root',
+        help: 'Root module directory. '
+            'Generated module paths are relative to this root.');
     argParser.addOption('build-root',
-        help: '''
-Root of source files.  Generated library names are relative to this root.
-''');
+        help: 'Root of source files. '
+            'Generated library names are relative to this root.');
     CompilerOptions.addArguments(argParser);
     AnalyzerOptions.addArguments(argParser);
   }
@@ -50,8 +52,23 @@ Root of source files.  Generated library names are relative to this root.
     } else {
       buildRoot = Directory.current.path;
     }
-    var unit = new BuildUnit(path.basenameWithoutExtension(outPath), buildRoot,
-        argResults.rest, _moduleForLibrary);
+    var moduleRoot = argResults['module-root'] as String;
+    String modulePath;
+    if (moduleRoot != null) {
+      moduleRoot = path.absolute(moduleRoot);
+      if (!path.isWithin(moduleRoot, outPath)) {
+        usageException('Output file $outPath must be within the module root '
+            'directory $moduleRoot');
+      }
+      modulePath =
+          path.withoutExtension(path.relative(outPath, from: moduleRoot));
+    } else {
+      moduleRoot = path.dirname(outPath);
+      modulePath = path.basenameWithoutExtension(outPath);
+    }
+
+    var unit = new BuildUnit(modulePath, buildRoot, argResults.rest,
+        (source) => _moduleForLibrary(moduleRoot, source));
 
     JSModuleFile module = compiler.compile(unit, compilerOptions);
     module.errors.forEach(messageHandler);
@@ -71,9 +88,17 @@ Root of source files.  Generated library names are relative to this root.
     }
   }
 
-  String _moduleForLibrary(Source source) {
+  String _moduleForLibrary(String moduleRoot, Source source) {
     if (source is InSummarySource) {
-      return path.basenameWithoutExtension(source.summaryPath);
+      var summaryPath = source.summaryPath;
+      if (path.isWithin(moduleRoot, summaryPath)) {
+        return path
+            .withoutExtension(path.relative(summaryPath, from: moduleRoot));
+      }
+
+      throw usageException(
+          'Imported file ${source.uri} is not within the module root '
+          'directory $moduleRoot');
     }
 
     throw usageException(

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

@@ -1,5 +1,4 @@
 // Copyright (c) 2015, 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.
 

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

@@ -8,7 +8,7 @@ author: Dart Dev Compiler team <[email protected]>
 homepage: https://github.com/dart-lang/dev_compiler
 
 dependencies:
-  analyzer: ^0.27.3
+  analyzer: ^0.27.4-alpha.2
   args: ^0.13.0
   bazel_worker: ^0.1.0
   cli_util: ^0.0.1