Chromium Code Reviews| Index: sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart |
| diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart |
| index ba5a9d942b1601a124e8965b402ca29ff86d88c6..53424c2431f1d4173412b41606d52a6db2af545d 100644 |
| --- a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart |
| +++ b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart |
| @@ -750,7 +750,6 @@ $lazyInitializerLogic |
| compiler.codegenWorld.instantiatedClasses.contains(classElement); |
| void visitField(ClassElement enclosingClass, Element member) { |
| - assert(!member.isNative()); |
| assert(invariant(classElement, member.isDeclaration)); |
| LibraryElement library = member.getLibrary(); |
| @@ -778,8 +777,9 @@ $lazyInitializerLogic |
| String accessorName = isShadowed |
| ? namer.shadowedFieldName(member) |
| : namer.getName(member); |
| - String fieldName = enclosingClass.isNative() ? |
| - member.name.slowToString() : accessorName; |
| + String fieldName = member.isNative() |
| + ? member.nativeName() |
| + : accessorName; |
|
ngeoffray
2012/11/28 20:31:23
fits in one line now?
sra1
2012/12/04 01:31:31
Not quite.
|
| bool needsCheckedSetter = false; |
| if (needsSetter && compiler.enableTypeAssertions |
| && canGenerateCheckedSetter(member)) { |
| @@ -1289,7 +1289,9 @@ $classesCollector.$mangledName = {'': |
| if (member.isGetter()) { |
| getter = "this.${namer.getterName(member.getLibrary(), member.name)}()"; |
| } else { |
| - String name = namer.instanceFieldName(memberLibrary, member.name); |
| + String name = member.isNative() |
| + ? member.nativeName() |
| + : namer.instanceFieldName(memberLibrary, member.name); |
| getter = "this.$name"; |
| } |
| for (Selector selector in selectors) { |