fixed files form Closure #72

Spirals-Team · Mar 7, 2017 · 04638da · 04638da
1 parent ea26fc1
commit 04638da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/projects/Closure/72/com/google/javascript/jscomp/FunctionToBlockMutator.java b/projects/Closure/72/com/google/javascript/jscomp/FunctionToBlockMutator.java
@@ -149,6 +149,8 @@ compiler, fnNode, new MakeDeclaredNamesUnique(
                 "inline_",
                 isCallInLoop)));
     // Make label names unique to this instance.
+    new RenameLabels(compiler, new LabelNameSupplier(idSupplier), false)
+        .process(null, fnNode);
   }
 
   static class LabelNameSupplier implements Supplier<String> {

diff --git a/projects/Closure/72/com/google/javascript/jscomp/RenameLabels.java b/projects/Closure/72/com/google/javascript/jscomp/RenameLabels.java
@@ -212,7 +212,7 @@ private void visitLabel(Node node, Node parent) {
       String name = nameNode.getString();
       LabelInfo li = getLabelInfo(name);
       // This is a label...
-      if (li.referenced) {
+      if (li.referenced || !removeUnused) {
         String newName = getNameForId(li.id);
         if (!name.equals(newName)) {
           // ... and it is used, give it the short name.