Allow uninitialized var _F_toggleOrdinals for type definition.

PiperOrigin-RevId: 550063262

Author: shicks

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

@@ -20,6 +20,7 @@
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.QualifiedName;
+import com.google.javascript.rhino.Token;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -79,7 +80,10 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           && n.getFirstChild().matchesName(ORDINAL_VAR_NAME)) {
         Node rhs = n.getFirstFirstChild();
 
-        if (rhs == null || !rhs.isObjectLit()) {
+        if (rhs == null && n.getToken() == Token.VAR) {
+          // An empty var is a type definition, which is OK.
+          return;
+        } else if (!rhs.isObjectLit()) {
           compiler.report(JSError.make(n, INVALID_ORDINAL_MAPPING, "not an object literal"));
           return;
         }

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

@@ -37,8 +37,20 @@ public void resetPassParameters() throws Exception {
     check = false;
   }
 
+  @Test
+  public void testBootstrapOrdinals_uninitialized() {
+    check = true;
+    testSame(srcs("var _F_toggleOrdinals;"), expectOrdinals(null));
+  }
+
   @Test
   public void testBootstrapOrdinals_empty() {
+    check = true;
+    testSame(srcs("var _F_toggleOrdinals = {};"), expectOrdinals(ImmutableMap.of()));
+  }
+
+  @Test
+  public void testBootstrapOrdinals_simple() {
     check = true;
     testSame(
         srcs("var _F_toggleOrdinals = {'foo_bar': 1};"),
@@ -49,14 +61,20 @@ public void testBootstrapOrdinals_empty() {
   }
 
   @Test
-  public void testBootstrapOrdinals_simple() {
+  public void testBootstrapOrdinals_ignoresExtraUninitializedDefinitions() {
     check = true;
     testSame(
-        srcs("var _F_toggleOrdinals = {'foo_bar': 1};"),
-        expectOrdinals(ImmutableMap.of("foo_bar", 1)));
+        srcs(
+            lines(
+                "var _F_toggleOrdinals = {'foo': 1};", //
+                "var _F_toggleOrdinals;")),
+        expectOrdinals(ImmutableMap.of("foo", 1)));
     testSame(
-        srcs("var _F_toggleOrdinals = {'foo_bar': 1, qux: 2};"),
-        expectOrdinals(ImmutableMap.of("foo_bar", 1, "qux", 2)));
+        srcs(
+            lines(
+                "var _F_toggleOrdinals;", //
+                "var _F_toggleOrdinals = {'foo': 1};")),
+        expectOrdinals(ImmutableMap.of("foo", 1)));
   }
 
   @Test
@@ -70,10 +88,6 @@ public void testBootstrapOrdinals_notAnObject() {
         srcs("var _F_toggleOrdinals = [];"),
         error(ReplaceToggles.INVALID_ORDINAL_MAPPING)
             .withMessageContaining("not an object literal"));
-    test(
-        srcs("var _F_toggleOrdinals;"),
-        error(ReplaceToggles.INVALID_ORDINAL_MAPPING)
-            .withMessageContaining("not an object literal"));
   }
 
   @Test