| Index: sdk/lib/_internal/compiler/implementation/js_backend/namer.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/namer.dart b/sdk/lib/_internal/compiler/implementation/js_backend/namer.dart
|
| index fa6f91e0a59498dc43e58a6202955993b3772208..8865c6953ea824e9f03e69039265250153ed30a1 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/js_backend/namer.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/js_backend/namer.dart
|
| @@ -174,6 +174,9 @@ class Namer implements ClosureNamer {
|
|
|
| final String CURRENT_ISOLATE = r'$';
|
|
|
| + final String getterPrefix = r'get$';
|
| + final String setterPrefix = r'set$';
|
| +
|
| /**
|
| * Map from top-level or static elements to their unique identifiers provided
|
| * by [getName].
|
| @@ -344,10 +347,10 @@ class Namer implements ClosureNamer {
|
| String invocationName(Selector selector) {
|
| if (selector.isGetter()) {
|
| String proposedName = privateName(selector.library, selector.name);
|
| - return 'get\$${getMappedInstanceName(proposedName)}';
|
| + return '$getterPrefix${getMappedInstanceName(proposedName)}';
|
| } else if (selector.isSetter()) {
|
| String proposedName = privateName(selector.library, selector.name);
|
| - return 'set\$${getMappedInstanceName(proposedName)}';
|
| + return '$setterPrefix${getMappedInstanceName(proposedName)}';
|
| } else {
|
| SourceString name = selector.name;
|
| if (selector.kind == SelectorKind.OPERATOR
|
| @@ -411,26 +414,26 @@ class Namer implements ClosureNamer {
|
| // therefore be derived from the instance field-name.
|
| LibraryElement library = element.getLibrary();
|
| String name = getMappedInstanceName(privateName(library, element.name));
|
| - return 'set\$$name';
|
| + return '$setterPrefix$name';
|
| }
|
|
|
| String setterNameFromAccessorName(String name) {
|
| // We dynamically create setters from the field-name. The setter name must
|
| // therefore be derived from the instance field-name.
|
| - return 'set\$$name';
|
| + return '$setterPrefix$name';
|
| }
|
|
|
| String publicGetterName(SourceString name) {
|
| // We dynamically create getters from the field-name. The getter name must
|
| // therefore be derived from the instance field-name.
|
| String fieldName = getMappedInstanceName(name.slowToString());
|
| - return 'get\$$fieldName';
|
| + return '$getterPrefix$fieldName';
|
| }
|
|
|
| String getterNameFromAccessorName(String name) {
|
| // We dynamically create getters from the field-name. The getter name must
|
| // therefore be derived from the instance field-name.
|
| - return 'get\$$name';
|
| + return '$getterPrefix$name';
|
| }
|
|
|
| String getterName(Element element) {
|
| @@ -438,7 +441,7 @@ class Namer implements ClosureNamer {
|
| // therefore be derived from the instance field-name.
|
| LibraryElement library = element.getLibrary();
|
| String name = getMappedInstanceName(privateName(library, element.name));
|
| - return 'get\$$name';
|
| + return '$getterPrefix$name';
|
| }
|
|
|
| String getMappedGlobalName(String proposedName) {
|
| @@ -647,7 +650,7 @@ class Namer implements ClosureNamer {
|
|
|
| String getLazyInitializerName(Element element) {
|
| assert(Elements.isStaticOrTopLevelField(element));
|
| - return getMappedGlobalName("get\$${getName(element)}");
|
| + return getMappedGlobalName("$getterPrefix${getName(element)}");
|
| }
|
|
|
| String isolatePropertiesAccess(Element element) {
|
|
|