Remove legacy @closureUnaware AST structure support

PiperOrigin-RevId: 850143647

Author: lauraharker

src/com/google/javascript/jscomp/AstValidator.java

@@ -1034,13 +1034,7 @@ private void validateShadowContentIfPresent(Node n) {
     }
     Node shadowJsCall = exprResult.getOnlyChild();
     if (!shadowJsCall.isCall()) {
-
-      // TODO: b/421971366 - remove this special allowance for FUNCTION nodes after cl/830654412
-      // is in the compiler release.
-      if (!shadowJsCall.isFunction()) {
-        violation("Shadow node EXPR_RESULT child is not a function or call", shadowJsCall);
-        return;
-      }
+      violation("Shadow node EXPR_RESULT child is not a call", shadowJsCall);
       return;
     }
     Node shadowJsFunction = shadowJsCall.getLastChild();

src/com/google/javascript/jscomp/CodeGenerator.java

@@ -207,13 +207,8 @@ protected void add(Node node, Context context, boolean printComments) {
     if (shadow != null) {
       Node script = shadow.getOnlyChild();
       Node sinkCall = script.getOnlyChild().getOnlyChild();
-      if (sinkCall.isCall()) {
-        add(sinkCall.getLastChild(), context, printComments);
-      } else {
-        // TODO: b/421971366 - delete this branch once cl/830654412 is in the release.
-        checkState(sinkCall.isFunction(), sinkCall);
-        add(sinkCall, context, printComments);
-      }
+      checkState(sinkCall.isCall(), sinkCall);
+      add(sinkCall.getLastChild(), context, printComments);
       return;
     }
     if (printComments) {

src/com/google/javascript/jscomp/ManageClosureUnawareCode.java

@@ -305,20 +305,14 @@ private void tryUnwrapClosureUnawareShadowedCode(NodeTraversal t, Node n) {
       }
 
       // ROOT -> SCRIPT -> EXPR_RESULT -> CALL -> FUNCTION
-      //  or, until cl/830654412 is fully released:
-      // ROOT -> SCRIPT -> EXPR_RESULT -> FUNCTION
       Node shadowScript = shadowAstRoot.getOnlyChild();
       checkState(shadowScript.isScript(), shadowScript);
       checkState(shadowScript.hasOneChild(), shadowScript);
       Node exprResult = shadowScript.getOnlyChild();
       checkState(exprResult.isExprResult(), exprResult);
-      Node originalCodeFunction;
-      if (exprResult.getFirstChild().isCall()) {
-        originalCodeFunction = exprResult.getFirstChild().getLastChild();
-      } else {
-        // TODO: b/421971366 - delete this branch once cl/830654412 is released.
-        originalCodeFunction = exprResult.getFirstChild();
-      }
+      Node callNode = exprResult.getOnlyChild();
+      checkState(callNode.isCall(), callNode);
+      Node originalCodeFunction = callNode.getLastChild();
       checkState(originalCodeFunction.isFunction(), originalCodeFunction);
       originalCodeFunction.detach();
       n.replaceWith(originalCodeFunction);

test/com/google/javascript/jscomp/AstValidatorTest.java

@@ -1761,7 +1761,7 @@ public void testShadowContent_validatesSingularExpectedStructure() {
     expectInvalid(f, Check.STATEMENT, "Shadow SCRIPT node child is not an expr result node");
 
     shadowHost.setClosureUnawareShadow(IR.root(this.parseValidScript("(x++)").detach()));
-    expectInvalid(f, Check.STATEMENT, "Shadow node EXPR_RESULT child is not a function or call");
+    expectInvalid(f, Check.STATEMENT, "Shadow node EXPR_RESULT child is not a call");
 
     shadowHost.setClosureUnawareShadow(IR.root(this.parseValidScript("x()").detach()));
     expectInvalid(f, Check.STATEMENT, "Shadow node CALL child is not a function");
@@ -1771,36 +1771,6 @@ public void testShadowContent_validatesSingularExpectedStructure() {
     expectValid(f, Check.STATEMENT);
   }
 
-  @Test
-  public void testShadowContent_validatesSingularExpectedStructure_legacyStructure() {
-    // TODO: b/421971366 - delete this test case once cl/830654412 is in the release.
-    // Since we're building the AST by hand, there won't be any types on it.
-    typeInfoValidationMode = TypeInfoValidation.NONE;
-
-    Node shadowHost = IR.name("f");
-    Node f = IR.exprResult(shadowHost);
-    expectValid(f, Check.STATEMENT);
-
-    shadowHost.setClosureUnawareShadow(IR.name("x"));
-    expectInvalid(f, Check.STATEMENT, "Shadow reference node is not a ROOT node");
-
-    shadowHost.setClosureUnawareShadow(IR.root());
-    expectInvalid(f, Check.STATEMENT, "Shadow root node's child is not a script node");
-
-    shadowHost.setClosureUnawareShadow(
-        IR.root(IR.script(IR.exprResult(IR.name("x")), IR.exprResult(IR.name("y")))));
-    expectInvalid(f, Check.STATEMENT, "Shadow SCRIPT node child has more than one child");
-
-    shadowHost.setClosureUnawareShadow(IR.root(this.parseValidScript("function foo(){}").detach()));
-    expectInvalid(f, Check.STATEMENT, "Shadow SCRIPT node child is not an expr result node");
-
-    shadowHost.setClosureUnawareShadow(IR.root(this.parseValidScript("(x++)").detach()));
-    expectInvalid(f, Check.STATEMENT, "Shadow node EXPR_RESULT child is not a function or call");
-
-    shadowHost.setClosureUnawareShadow(IR.root(this.parseValidScript("(function(){})").detach()));
-    expectValid(f, Check.STATEMENT);
-  }
-
   @Test
   public void checkRequiredInlinings_failsWithRemainingRequiredInlinings() {
     // Write a reference to a function that required inlining. We need an enclosing statement

test/com/google/javascript/jscomp/CodePrinterTest.java

@@ -4557,19 +4557,6 @@ public void testPrintsContentOfClosureUnawareShadow() {
         .isEqualTo("function(){}");
   }
 
-  @Test
-  public void testPrintsContentOfClosureUnawareShadow_legacyStructure() {
-    // TODO: b/421971366 - delete this test case once cl/830654412 is in the release.
-    Node shadowHost = IR.name("SHADOW");
-    AstFactory astFactory = new Compiler().createAstFactoryWithoutTypes();
-    Node closureUnawareFn = astFactory.createEmptyFunction(AstFactory.type(StandardColors.UNKNOWN));
-    shadowHost.setClosureUnawareShadow(IR.root(IR.script(IR.exprResult(closureUnawareFn))));
-
-    assertThat(
-            new CodePrinter.Builder(shadowHost).setCompilerOptions(new CompilerOptions()).build())
-        .isEqualTo("function(){}");
-  }
-
   private void checkWithOriginalName(
       String code, String expectedCode, CompilerOptions compilerOptions) {
     compilerOptions.setCheckSymbols(true);