Chromium Code Reviews| Index: lib/kernel.dart |
| diff --git a/lib/kernel.dart b/lib/kernel.dart |
| index 3ae96fc12539da01b47ef0b499c892a4b5a9a5d7..b4331ad33f00b3f75f3a660aa0e1507ae36a5ca0 100644 |
| --- a/lib/kernel.dart |
| +++ b/lib/kernel.dart |
| @@ -27,7 +27,7 @@ import 'package:compiler/src/elements/elements.dart' show |
| FunctionElement, |
| ImportElement, |
| LibraryElement, |
| - Name, |
| + MixinApplicationElement, |
| TypeVariableElement; |
| import 'package:compiler/src/elements/modelx.dart' show |
| @@ -136,15 +136,17 @@ class Kernel { |
| } |
| ir.Name irName(String name, Element element) { |
| - return new ir.Name(name, libraryToIr(element.library)); |
| - } |
| - |
| - ir.Name nameToIrName(Name name) { |
| - ir.Library library; |
| - if (name.isPrivate) { |
| - library = libraryToIr(name.library); |
| + ir.Library irLibrary = null; |
| + if (name.startsWith("_")) { |
| + ClassElement cls = element.enclosingClass; |
| + if (cls != null && cls.isMixinApplication) { |
| + MixinApplicationElement mixinApplication = cls; |
| + element = mixinApplication.mixin; |
| + } |
| + name = "$name@${element.library.libraryOrScriptName}"; |
|
kustermann
2016/08/01 10:37:39
I landed a modified version of this patch on origi
ahe
2016/08/01 10:44:41
What kind of issues? In the Dart VM?
kustermann
2016/08/01 11:23:39
I don't recall the details, since it's almost 4 we
kasperl
2016/08/02 06:17:44
I think the VM may have special treatment of symbo
ahe
2016/08/02 11:09:10
This seems to work:
"${element.library.libraryOrS
|
| + irLibrary = libraryToIr(element.library); |
| } |
| - return new ir.Name(name.text, library); |
| + return new ir.Name(name, irLibrary); |
| } |
| Future<ir.Library> loadLibrary(Uri uri) async { |
| @@ -436,7 +438,7 @@ class Kernel { |
| ? const ir.InvalidType() |
| : typeToIr(field.type); |
| ir.Field fieldNode = new ir.Field( |
| - nameToIrName(field.memberName), type: type, initializer: null, |
| + irName(field.memberName.text, field), type: type, initializer: null, |
| isFinal: field.isFinal, isStatic: field.isStatic || field.isTopLevel, |
| isConst: field.isConst); |
| addWork(field, () { |