Honor @noinline annotation in InlineVariables.

brad4d · Tyler Breisacher · commit 5698304a8e88 · 2017-12-21T13:31:23.000-08:00
Related to #2751 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179758969
diff --git a/src/com/google/javascript/jscomp/InlineVariables.java b/src/com/google/javascript/jscomp/InlineVariables.java
@@ -23,6 +23,7 @@
 import com.google.common.base.Predicates;
 import com.google.javascript.jscomp.CodingConvention.SubclassRelationship;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Behavior;
+import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.TypeI;
 import java.util.HashMap;
@@ -347,7 +348,8 @@ private boolean isVarInlineForbidden(Var var) {
           || compiler
               .getCodingConvention()
               .isPropertyRenameFunction(var.nameNode.getOriginalQualifiedName())
-          || staleVars.contains(var);
+          || staleVars.contains(var)
+          || hasNoInlineAnnotation(var);
     }
 
     /**
@@ -739,4 +741,9 @@ private boolean isImmutableAndWellDefinedVariable(Var v,
       return true;
     }
   }
+
+  private static boolean hasNoInlineAnnotation(Var var) {
+    JSDocInfo jsDocInfo = var.getJSDocInfo();
+    return jsDocInfo != null && jsDocInfo.isNoInline();
+  }
 }
diff --git a/test/com/google/javascript/jscomp/InlineVariablesTest.java b/test/com/google/javascript/jscomp/InlineVariablesTest.java
@@ -110,6 +110,10 @@ public void testInlineGlobal() {
     test("var x = 1; var z = x;", "var z = 1;");
   }
 
+  public void testNoInlineAnnotation() {
+    testSame("/** @noinline */ var x = 1; var z = x;");
+  }
+
   public void testNoInlineExportedName() {
     testSame("var _x = 1; var z = _x;");
   }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ public void testInlineGlobal() {`
`110`	`110`	`test("var x = 1; var z = x;", "var z = 1;");`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ public void testNoInlineAnnotation() {`
	`114`	`+ testSame("/** @noinline */ var x = 1; var z = x;");`
	`115`	`+ }`
	`116`	`+`
`113`	`117`	`public void testNoInlineExportedName() {`
`114`	`118`	`testSame("var _x = 1; var z = _x;");`
`115`	`119`	`}`