Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/src/fletch_context.dart

 // Copyright (c) 2015, the Fletch 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.md file.
 
 library fletchc.fletch_context;
 
 import 'package:compiler/src/tree/tree.dart' show
     Node;
 
-import 'package:compiler/src/universe/universe.dart' show
-    Selector;
-
 import 'package:compiler/src/elements/elements.dart' show
     ClassElement,
     Element,
     FieldElement,
     FunctionElement,
     FunctionSignature,
     LibraryElement,
-    ParameterElement;
+    ParameterElement,
+    Name;
 
-import 'package:compiler/src/resolution/resolution.dart' show
+import 'package:compiler/src/resolution/tree_elements.dart' show
     TreeElements;
 
+import 'package:compiler/src/universe/selector.dart' show
+    Selector;
+
 import 'package:compiler/src/constants/expressions.dart' show
     ConstantExpression;
 
 import 'package:compiler/src/constants/values.dart' show
     ConstantValue,
     ConstructedConstantValue,
     FunctionConstantValue;
 
-import 'package:compiler/src/dart2jslib.dart' show
-    isPrivateName;
-
 import 'fletch_compiler_implementation.dart' show
     FletchCompilerImplementation;
 
 export 'fletch_compiler_implementation.dart' show
     FletchCompilerImplementation;
 
 import 'fletch_backend.dart' show
     FletchBackend;
 
 export 'fletch_backend.dart' show
@@ skipping 21 matching lines @@
 
   Map<String, FletchNativeDescriptor> nativeDescriptors;
 
   Set<String> names = new Set<String>();
 
   Map<FieldElement, int> staticIndices = <FieldElement, int>{};
 
   Map<LibraryElement, String> libraryTag = <LibraryElement, String>{};
   List<String> symbols = <String>[];
   Map<String, int> symbolIds = <String, int>{};
+  Map<Name, String> nameToSymbol = <Name, String>{};
   Map<Selector, String> selectorToSymbol = <Selector, String>{};
 
   FletchContext(this.compiler);
 
   FletchBackend get backend => compiler.backend;
 
   bool get enableBigint {
     String enableBigintConstant = compiler.environment['fletch.enable-bigint'];
     return enableBigintConstant != "false";
   }
 
   void setNames(Map<String, String> names) {
     // Generate symbols of the values.
     for (String name in names.values) {
       this.names.add(name);
       getSymbolId(name);
     }
   }
 
-  String mangleName(String name, LibraryElement library) {
-    if (!isPrivateName(name)) return name;
-    if (library.isPlatformLibrary && names.contains(name)) return name;
-    return name + getLibraryTag(library);
+  String mangleName(Name name) {
+    if (!name.isPrivate) return name.text;
+    if (name.library.isPlatformLibrary && names.contains(name.text)) {
+      return name.text;
+    }
+    return name.text + getLibraryTag(name.library);
   }
 
   String getLibraryTag(LibraryElement library) {
     return libraryTag.putIfAbsent(library, () {
       // Give the core library the unique mangling of the empty string. That
       // will make the VM able to create selector into core (used for e.g.
       // _noSuchMethodTrampoline).
       if (library == compiler.coreLibrary) return "";
       return "%${libraryTag.length}";
     });
   }
 
   int getStaticFieldIndex(FieldElement element, Element referrer) {
     return staticIndices.putIfAbsent(element, () => staticIndices.length);
   }
 
   String getSymbolFromSelector(Selector selector) {
     return selectorToSymbol.putIfAbsent(selector, () {
       StringBuffer buffer = new StringBuffer();
-      buffer.write(mangleName(selector.name, selector.library));
+      buffer.write(mangleName(selector.memberName));
       for (String namedArgument in selector.namedArguments) {
         buffer.write(":");
         buffer.write(namedArgument);
       }
       return buffer.toString();
     });
   }
 
   void writeNamedArguments(StringBuffer buffer, FunctionSignature signature) {
     signature.orderedForEachParameter((ParameterElement parameter) {
       if (parameter.isNamed) {
         buffer.write(":");
         buffer.write(parameter.name);
       }
     });
   }
 
   String getSymbolForFunction(
       String name,
       FunctionSignature signature,
       LibraryElement library) {
     StringBuffer buffer = new StringBuffer();
-    buffer.write(mangleName(name, library));
+    buffer.write(mangleName(new Name(name, library)));
     writeNamedArguments(buffer, signature);
     return buffer.toString();
   }
 
   String getCallSymbol(FunctionSignature signature) {
     return getSymbolForFunction('call', signature, null);
   }
 
   int getSymbolId(String symbol) {
     return symbolIds.putIfAbsent(symbol, () {
@@ skipping 48 matching lines @@
     if (selector.isSetter) return SelectorKind.Setter;
     return SelectorKind.Method;
   }
 
   void registerConstructedConstantValue(ConstructedConstantValue value) {
     ClassElement classElement = value.type.element;
     backend.registerClassElement(classElement);
     // TODO(ahe): This should not be required. Also, instantiate type,
     // not class.
     FletchRegistry registry =
-        new FletchRegistry(compiler, classElement.resolvedAst.elements);
+        new FletchRegistry(compiler, null);

[ahe, 2015/11/17 16:44:09]

Fits one line?

[sigurdm, 2015/11/19 14:33:47]

Done.

     registry.registerInstantiatedClass(classElement);
   }
 
   void registerFunctionConstantValue(FunctionConstantValue value) {
     backend.markFunctionConstantAsUsed(value);
   }
 
   void markConstantUsed(ConstantValue constant) {
     backend.systemBuilder.registerConstant(constant, this);
   }
@@ skipping 24 matching lines @@
     // TODO(johnniwinther): Should be handled in resolution.
     ConstantExpression expression =
         compiler.resolver.constantCompiler.compileNode(
             node, elements, enforceConst: isConst);
     return expression;
   }
 
   ConstantValue getConstantValue(ConstantExpression expression) {
     return compiler.constants.getConstantValue(expression);
   }
+

[ahe, 2015/11/17 16:44:09]

Extra line.

[sigurdm, 2015/11/19 14:33:47]

Done.

 }