---

yaml --- r: 191338 b: refs/heads/beta c: 71f1a61 h: refs/heads/master
dart-lang · Aug 27, 2019 · 863fb7d · 863fb7d
1 parent b9d2709
commit 863fb7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -911,7 +911,7 @@ refs/tags/2.3.0-flutter-1.5.4-hotfix.1: a1668566e563aef64025d0af88a099cbbe847b7e
 refs/tags/2.3.1: 929b013ddc83a013b49a98fc28b6b503a972bddd
 refs/tags/2.3.1-dev.0.0: 1d1742efd39cd4762b844b510acf8c2f1fa6604e
 refs/tags/2.3.2-dev.0.0: c567183bac8a895014d79cd3bf1d8908d45547d6
-refs/heads/beta: 7c6cab995a1bf955992cde62adeb440a4e38e19e
+refs/heads/beta: 71f1a615f4dd95d632eea6b291d8fd3446d57e4e
 refs/heads/sjindel.mep: b113b36c157cf54b257e82550e9bbde16f05ad8d
 refs/tags/2.3.2: f7ab96133aa79301daf812ef40b33c99d8ad1495
 refs/tags/2.3.2-dev.0.1: ef57e27c9798b54a54e9a1f74b1bd1f9be7290b1

diff --git a/branches/beta/pkg/compiler/lib/src/js_backend/namer.dart b/branches/beta/pkg/compiler/lib/src/js_backend/namer.dart
@@ -867,7 +867,10 @@ class Namer extends ModularNamer {
     // apply. So we can directly grab a name.
     if (element is JSEntity) {
       return _disambiguateInternalMember(
-          element, () => (element as JSEntity).declaredName);
+          element,
+          () => (element as JSEntity)
+              .declaredName
+              .replaceAll(_nonIdentifierRE, '_'));
     }
 
     // If the name of the field might clash with another field,
@@ -1257,7 +1260,7 @@ class Namer extends ModularNamer {
       ClassEntity enclosingClass = element.enclosingClass;
       return '${enclosingClass.name}_${element.name}';
     }
-    return element.name.replaceAll('+', '_');
+    return element.name.replaceAll(_nonIdentifierRE, '_');
   }
 
   String _proposeNameForLazyStaticGetter(MemberEntity element) {