merged

Author: John Messerly

pkg/dev_compiler/lib/runtime/dart_sdk.js

@@ -946,6 +946,9 @@ dart_library.library('dart_sdk', null, /* Imports */[
   dart.throwStrongModeTypeError = function(object, actual, type) {
     dart.throw(new _js_helper.StrongModeTypeError(object, dart.typeName(actual), dart.typeName(type)));
   };
+  dart.throwUnimplementedError = function(message) {
+    dart.throw(new core.UnimplementedError(message));
+  };
   dart.throwAssertionError = function() {
     dart.throw(new core.AssertionError());
   };
@@ -1564,6 +1567,9 @@ dart_library.library('dart_sdk', null, /* Imports */[
     if (ft2 === core.Function) {
       return true;
     }
+    if (ft1 === core.Function) {
+      return false;
+    }
     let ret1 = ft1.returnType;
     let ret2 = ft2.returnType;
     let args1 = ft1.args;
@@ -2251,7 +2257,25 @@ dart_library.library('dart_sdk', null, /* Imports */[
   dart._typeFormalCount = Symbol("_typeFormalCount");
   dart.isSubtype = dart._subtypeMemo((t1, t2) => t1 === t2 || dart._isSubtype(t1, t2, true));
   dart.hasOwnProperty = Object.prototype.hasOwnProperty;
-  _debugger.skipDartConfig = dart.const(new core.Object());
+  _debugger.JsonMLConfig = class JsonMLConfig extends core.Object {
+    new(name) {
+      this.name = name;
+    }
+  };
+  dart.setSignature(_debugger.JsonMLConfig, {
+    constructors: () => ({new: dart.definiteFunctionType(_debugger.JsonMLConfig, [core.String])})
+  });
+  dart.defineLazy(_debugger.JsonMLConfig, {
+    get none() {
+      return dart.const(new _debugger.JsonMLConfig("none"));
+    },
+    get skipDart() {
+      return dart.const(new _debugger.JsonMLConfig("skipDart"));
+    },
+    get keyToString() {
+      return dart.const(new _debugger.JsonMLConfig("keyToString"));
+    }
+  });
   _debugger.maxIterableChildrenToDisplay = 50;
   dart.defineLazy(_debugger, {
     get _devtoolsFormatter() {
@@ -2334,10 +2358,10 @@ dart_library.library('dart_sdk', null, /* Imports */[
     new(opts) {
       let name = opts && 'name' in opts ? opts.name : null;
       let value = opts && 'value' in opts ? opts.value : null;
-      let skipDart = opts && 'skipDart' in opts ? opts.skipDart : null;
+      let config = opts && 'config' in opts ? opts.config : _debugger.JsonMLConfig.none;
       this.name = name;
       this.value = value;
-      this.skipDart = skipDart == true;
+      this.config = config;
     }
     ['=='](other) {
       return _debugger.NameValuePair.is(other) && other.name == this.name;
@@ -2347,7 +2371,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
     }
   };
   dart.setSignature(_debugger.NameValuePair, {
-    constructors: () => ({new: dart.definiteFunctionType(_debugger.NameValuePair, [], {name: core.String, value: core.Object, skipDart: core.bool})})
+    constructors: () => ({new: dart.definiteFunctionType(_debugger.NameValuePair, [], {name: core.String, value: core.Object, config: _debugger.JsonMLConfig})})
   });
   _debugger.MapEntry = class MapEntry extends core.Object {
     new(opts) {
@@ -2358,7 +2382,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
     }
   };
   dart.setSignature(_debugger.MapEntry, {
-    constructors: () => ({new: dart.definiteFunctionType(_debugger.MapEntry, [], {key: core.String, value: core.Object})})
+    constructors: () => ({new: dart.definiteFunctionType(_debugger.MapEntry, [], {key: core.Object, value: core.Object})})
   });
   _debugger.ClassMetadata = class ClassMetadata extends core.Object {
     new(object) {
@@ -2445,11 +2469,14 @@ dart_library.library('dart_sdk', null, /* Imports */[
       this[_simpleFormatter] = simpleFormatter;
     }
     header(object, config) {
-      if (core.identical(config, _debugger.skipDartConfig) || dart.test(_debugger.isNativeJavaScriptObject(object))) {
+      if (dart.equals(config, _debugger.JsonMLConfig.skipDart) || dart.test(_debugger.isNativeJavaScriptObject(object))) {
         return null;
       }
       let c = this[_simpleFormatter].preview(object);
       if (c == null) return null;
+      if (dart.equals(config, _debugger.JsonMLConfig.keyToString)) {
+        c = dart.toString(object);
+      }
       let element = new _debugger.JsonMLElement('span');
       element.setStyle('background-color: #d9edf7');
       element.createTextChild(c);
@@ -2471,9 +2498,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
           nameSpan.addStyle("padding-left: 13px;");
           li.appendChild(nameSpan);
           let objectTag = li.createObjectTag(child.value);
-          if (dart.test(child.skipDart)) {
-            objectTag.addAttribute('config', _debugger.skipDartConfig);
-          }
+          objectTag.addAttribute('config', child.config);
           if (!dart.test(this[_simpleFormatter].hasChildren(child.value))) {
             li.setStyle("padding-left: 13px;");
           }
@@ -2650,7 +2675,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
       return core.String._check(dart.typeName(dart.getReifiedType(object)));
     }
     children(object) {
-      return JSArrayOfNameValuePair().of([new _debugger.NameValuePair({name: 'signature', value: this.preview(object)}), new _debugger.NameValuePair({name: 'JavaScript Function', value: object, skipDart: true})]);
+      return JSArrayOfNameValuePair().of([new _debugger.NameValuePair({name: 'signature', value: this.preview(object)}), new _debugger.NameValuePair({name: 'JavaScript Function', value: object, config: _debugger.JsonMLConfig.skipDart})]);
     }
   };
   dart.setSignature(_debugger.FunctionFormatter, {
@@ -2676,7 +2701,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
       let map = core.Map._check(object);
       let entries = LinkedHashSetOfNameValuePair().new();
       map[dartx.forEach](dart.fn((key, value) => {
-        let entryWrapper = new _debugger.MapEntry({key: core.String._check(key), value: value});
+        let entryWrapper = new _debugger.MapEntry({key: key, value: value});
         entries.add(new _debugger.NameValuePair({name: dart.toString(entries.length), value: entryWrapper}));
       }, dynamicAnddynamicTovoid()));
       this.addMetadataChildren(object, entries);
@@ -2744,9 +2769,9 @@ dart_library.library('dart_sdk', null, /* Imports */[
       if (mixins != null && dart.test(dart.dload(mixins, 'isNotEmpty'))) {
         ret[dartx.add](new _debugger.NameValuePair({name: '[[Mixins]]', value: new _debugger.HeritageClause('mixins', core.List._check(mixins))}));
       }
-      ret[dartx.add](new _debugger.NameValuePair({name: '[[JavaScript View]]', value: entry.object, skipDart: true}));
+      ret[dartx.add](new _debugger.NameValuePair({name: '[[JavaScript View]]', value: entry.object, config: _debugger.JsonMLConfig.skipDart}));
       if (!core.Type.is(entry.object)) {
-        ret[dartx.add](new _debugger.NameValuePair({name: '[[JavaScript Constructor]]', value: _debugger.JSNative.getProperty(entry.object, 'constructor'), skipDart: true}));
+        ret[dartx.add](new _debugger.NameValuePair({name: '[[JavaScript Constructor]]', value: _debugger.JSNative.getProperty(entry.object, 'constructor'), config: _debugger.JsonMLConfig.skipDart}));
       }
       return ret;
     }
@@ -2773,7 +2798,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
       return true;
     }
     children(object) {
-      return JSArrayOfNameValuePair().of([new _debugger.NameValuePair({name: 'key', value: dart.dload(object, 'key')}), new _debugger.NameValuePair({name: 'value', value: dart.dload(object, 'value')})]);
+      return JSArrayOfNameValuePair().of([new _debugger.NameValuePair({name: 'key', value: dart.dload(object, 'key'), config: _debugger.JsonMLConfig.keyToString}), new _debugger.NameValuePair({name: 'value', value: dart.dload(object, 'value')})]);
     }
   };
   _debugger.MapEntryFormatter[dart.implements] = () => [_debugger.Formatter];

pkg/dev_compiler/lib/src/analyzer/context.dart

@@ -142,7 +142,9 @@ AnalysisContext createAnalysisContextWithSources(AnalyzerOptions options,
 /// Creates an analysis context that contains our restricted typing rules.
 AnalysisContextImpl createAnalysisContext() {
   var res = AnalysisEngine.instance.createAnalysisContext();
-  res.analysisOptions = new AnalysisOptionsImpl()..strongMode = true;
+  res.analysisOptions = new AnalysisOptionsImpl()
+    ..strongMode = true
+    ..trackCacheDependencies = false;
   return res;
 }
 

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

@@ -2716,18 +2716,32 @@ class CodeGenerator extends GeneralizingAstVisitor
       return _emitSend(target, '[]=', [lhs.index, rhs]);
     }
 
+    if (lhs is SimpleIdentifier) {
+      return _emitSetSimpleIdentifier(lhs, rhs);
+    }
+
     Expression target = null;
     SimpleIdentifier id;
     if (lhs is PropertyAccess) {
       if (lhs.operator.lexeme == '?.') {
         return _emitNullSafeSet(lhs, rhs);
       }
-
       target = _getTarget(lhs);
       id = lhs.propertyName;
     } else if (lhs is PrefixedIdentifier) {
+      if (isLibraryPrefix(lhs.prefix)) {
+        return _emitSet(lhs.identifier, rhs);
+      }
       target = lhs.prefix;
       id = lhs.identifier;
+    } else {
+      assert(false);
+    }
+
+    assert(target != null);
+
+    if (target is SuperExpression) {
+      return _emitSetSuper(lhs, target, id, rhs);
     }
 
     if (target != null && isDynamicInvoke(target)) {
@@ -2744,6 +2758,138 @@ class CodeGenerator extends GeneralizingAstVisitor
           [_visit(target), _emitMemberName(id.name), _visit(rhs)]);
     }
 
+    var accessor = id.staticElement;
+    var element =
+        accessor is PropertyAccessorElement ? accessor.variable : accessor;
+
+    if (element is ClassMemberElement && element is! ConstructorElement) {
+      bool isStatic = element.isStatic;
+      if (isStatic) {
+        if (element is FieldElement) {
+          return _emitSetStaticProperty(lhs, element, rhs);
+        }
+        return _badAssignment('Unknown static: $element', lhs, rhs);
+      }
+      if (element is FieldElement) {
+        return _emitWriteInstanceProperty(
+            lhs, _visit(target), element, _visit(rhs));
+      }
+    }
+
+    return _badAssignment('Unhandled assignment', lhs, rhs);
+  }
+
+  JS.Expression _badAssignment(String problem, Expression lhs, Expression rhs) {
+    // TODO(sra): We should get here only for compiler bugs or weirdness due to
+    // --unsafe-force-compile. Once those paths have been addressed, throw at
+    // compile time.
+    return js.call('dart.throwUnimplementedError((#, #, #))',
+        [js.string('$lhs ='), _visit(rhs), js.string(problem)]);
+  }
+
+  /// Emits assignment to a simple identifier. Handles all legal simple
+  /// identifier assignment targets (local, top level library member, implicit
+  /// `this` or class, etc.)
+  JS.Expression _emitSetSimpleIdentifier(
+      SimpleIdentifier node, Expression rhs) {
+    JS.Expression unimplemented() {
+      return _badAssignment("Unimplemented: unknown name '$node'", node, rhs);
+    }
+
+    var accessor = node.staticElement;
+    if (accessor == null) return unimplemented();
+
+    // Get the original declaring element. If we had a property accessor, this
+    // indirects back to a (possibly synthetic) field.
+    var element = accessor;
+    if (accessor is PropertyAccessorElement) element = accessor.variable;
+
+    _declareBeforeUse(element);
+
+    if (element is LocalVariableElement || element is ParameterElement) {
+      return _emitSetLocal(node, element, rhs);
+    }
+
+    if (element.enclosingElement is CompilationUnitElement) {
+      // Top level library member.
+      return _emitSetTopLevel(node, element, rhs);
+    }
+
+    // Unqualified class member. This could mean implicit `this`, or implicit
+    // static from the same class.
+    if (element is ClassMemberElement) {
+      bool isStatic = element.isStatic;
+      if (isStatic) {
+        if (element is FieldElement) {
+          return _emitSetStaticProperty(node, element, rhs);
+        }
+        return unimplemented();
+      }
+
+      // For instance members, we add implicit-this.
+      if (element is FieldElement) {
+        return _emitWriteInstanceProperty(
+            node, new JS.This(), element, _visit(rhs));
+      }
+      return unimplemented();
+    }
+
+    // We should not get here.
+    return unimplemented();
+  }
+
+  /// Emits assignment to a simple local variable or parameter.
+  JS.Expression _emitSetLocal(
+      SimpleIdentifier node, Element element, Expression rhs) {
+    JS.Expression target;
+    if (element is TemporaryVariableElement) {
+      // If this is one of our compiler's temporary variables, use its JS form.
+      target = element.jsVariable;
+    } else if (element is ParameterElement) {
+      target = _emitParameter(element);
+    } else {
+      target = new JS.Identifier(element.name);
+    }
+
+    return _visit(rhs).toAssignExpression(annotate(target, node));
+  }
+
+  /// Emits assignment to library scope element [element].
+  JS.Expression _emitSetTopLevel(
+      Expression lhs, Element element, Expression rhs) {
+    return _visit(rhs)
+        .toAssignExpression(annotate(_emitTopLevelName(element), lhs));
+  }
+
+  /// Emits assignment to a static field element or property.
+  JS.Expression _emitSetStaticProperty(
+      Expression lhs, Element element, Expression rhs) {
+    // For static methods, we add the raw type name, without generics or
+    // library prefix. We don't need those because static calls can't use
+    // the generic type.
+    ClassElement classElement = element.enclosingElement;
+    var type = classElement.type;
+    var dynType = _emitType(fillDynamicTypeArgs(type));
+    var member = _emitMemberName(element.name, isStatic: true, type: type);
+    return _visit(rhs).toAssignExpression(
+        annotate(new JS.PropertyAccess(dynType, member), lhs));
+  }
+
+  /// Emits an assignment to the [element] property of instance referenced by
+  /// [jsTarget].
+  JS.Expression _emitWriteInstanceProperty(Expression lhs,
+      JS.Expression jsTarget, Element element, JS.Expression value) {
+    String memberName = element.name;
+    var type = (element.enclosingElement as ClassElement).type;
+    var name = _emitMemberName(memberName, type: type);
+    return value.toAssignExpression(
+        annotate(new JS.PropertyAccess(jsTarget, name), lhs));
+  }
+
+  JS.Expression _emitSetSuper(Expression lhs, SuperExpression target,
+      SimpleIdentifier id, Expression rhs) {
+    // TODO(sra): Determine whether and access helper is required for the
+    // setter. For now fall back on the r-value path.
     return _visit(rhs).toAssignExpression(_visit(lhs));
   }
 

pkg/dev_compiler/pubspec.yaml

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

pkg/dev_compiler/test/codegen/language/function_subtype_regression_ddc_588_test.dart

@@ -0,0 +1,14 @@
+import "package:expect/expect.dart";
+
+// regression test for ddc #588
+
+typedef int Int2Int(int x);
+
+void foo(List<Int2Int> list) {
+  list.forEach((f) => print(f(42)));
+}
+
+void main() {
+  var l = <Function>[];
+  Expect.throws(() => foo(l), (e) => e is TypeError);
+}

pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/errors.dart

@@ -27,6 +27,10 @@ throwStrongModeTypeError(object, actual, type) => JS('', '''(() => {
                                    $typeName($type)));
 })()''');
 
+throwUnimplementedError(message) => JS('', '''(() => {
+  $throw_(new $UnimplementedError($message));
+})()''');
+
 throwAssertionError() => JS('', '''(() => {
   $throw_(new $AssertionError());
 })()''');

pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/types.dart

@@ -496,6 +496,10 @@ isFunctionSubtype(ft1, ft2, covariant) => JS('', '''(() => {
     return true;
   }
 
+  if ($ft1 === $Function) {
+    return false;
+  }
+
   let ret1 = $ft1.returnType;
   let ret2 = $ft2.returnType;