Merge remote-tracking branch 'upstream/master'

Author: ctjlewis

externs/browser/html5.js

@@ -3766,7 +3766,8 @@ XMLHttpRequest.prototype.response;
  *     refreshPolicy: string,
  *     signRequestData: string,
  *     includeTimestampHeader: boolean,
- *     additionalSignedHeaders: !Array<string>
+ *     additionalSignedHeaders: (!Array<string>|undefined),
+ *     additionalSigningData: (string|undefined)
  *   }}
  * @see https://docs.google.com/document/d/1qUjtKgA7nMv9YGMhi0xWKEojkSITKzGLdIcZgoz6ZkI
  */

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

@@ -174,7 +174,6 @@ private static void applyFullCompilationOptions(CompilerOptions options) {
     options.setReserveRawExports(true);
     options.setRenamingPolicy(VariableRenamingPolicy.ALL, PropertyRenamingPolicy.ALL_UNQUOTED);
     options.setRemoveUnusedPrototypeProperties(true);
-    options.setRemoveUnusedPrototypePropertiesInExterns(false);
     options.setRemoveUnusedClassProperties(true);
     options.setCollapseAnonymousFunctions(true);
     options.setCollapsePropertiesLevel(PropertyCollapseLevel.ALL);

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

@@ -504,9 +504,6 @@ public enum ExtractPrototypeMemberDeclarationsMode {
   /** Removes unused member prototypes */
   public boolean removeUnusedPrototypeProperties;
 
-  /** Tells AnalyzePrototypeProperties it can remove externed props. */
-  public boolean removeUnusedPrototypePropertiesInExterns;
-
   /** Removes unused member properties */
   public boolean removeUnusedClassProperties;
 
@@ -1373,7 +1370,6 @@ public CompilerOptions() {
     extractPrototypeMemberDeclarations =
         ExtractPrototypeMemberDeclarationsMode.OFF;
     removeUnusedPrototypeProperties = false;
-    removeUnusedPrototypePropertiesInExterns = false;
     removeUnusedClassProperties = false;
     removeUnusedVars = false;
     removeUnusedLocalVars = false;
@@ -2301,9 +2297,8 @@ public void setRemoveUnusedPrototypeProperties(boolean enabled) {
     this.inlineGetters = enabled;
   }
 
-  public void setRemoveUnusedPrototypePropertiesInExterns(boolean enabled) {
-    this.removeUnusedPrototypePropertiesInExterns = enabled;
-  }
+  @Deprecated
+  public void setRemoveUnusedPrototypePropertiesInExterns(boolean enabled) {}
 
   public void setCollapseVariableDeclarations(boolean enabled) {
     this.collapseVariableDeclarations = enabled;
@@ -3085,9 +3080,6 @@ public String toString() {
             .add("removeUnusedConstructorProperties", removeUnusedConstructorProperties)
             .add("removeUnusedLocalVars", removeUnusedLocalVars)
             .add("removeUnusedPrototypeProperties", removeUnusedPrototypeProperties)
-            .add(
-                "removeUnusedPrototypePropertiesInExterns",
-                removeUnusedPrototypePropertiesInExterns)
             .add("removeUnusedVars", removeUnusedVars)
             .add(
                 "renamePrefixNamespaceAssumeCrossChunkNames",

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

@@ -38,13 +38,6 @@ static void preprocess(CompilerOptions options) {
           "Cannot check use of goog.getCssName because of empty blacklist.");
     }
 
-    if (options.removeUnusedPrototypePropertiesInExterns
-        && !options.removeUnusedPrototypeProperties) {
-      throw new InvalidOptionsException(
-          "remove_unused_prototype_props_in_externs requires "
-          + "remove_unused_prototype_props to be turned on.");
-    }
-
     if (options.getInlineFunctionsLevel() == CompilerOptions.Reach.NONE
         && options.maxFunctionSizeAfterInlining
             != CompilerOptions.UNLIMITED_FUN_SIZE_AFTER_INLINING) {
@@ -60,13 +53,6 @@ static void preprocess(CompilerOptions options) {
       options.setAmbiguateProperties(false);
       options.setDisambiguateProperties(false);
     }
-
-    if (options.removeUnusedPrototypePropertiesInExterns
-        && options.exportLocalPropertyDefinitions) {
-      throw new InvalidOptionsException(
-          "remove_unused_prototype_props_in_externs "
-          + "and export_local_property_definitions cannot be used together.");
-    }
   }
 
   /** Exception to indicate incompatible options in the CompilerOptions. */

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

@@ -450,7 +450,7 @@ private void handleFor(Node forNode) {
     // The edge that transfer control to the beginning of the loop body.
     createEdge(forNode, Branch.ON_TRUE, computeFallThrough(body));
     // The edge to end of the loop.
-    if (!cond.isEmpty()) {
+    if (!cond.isEmpty() && !cond.isTrue()) {
       createEdge(forNode, Branch.ON_FALSE, computeFollowNode(forNode, this));
     }
     // The end of the body will have a unconditional branch to our iter

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

@@ -2420,8 +2420,7 @@ public void process(Node externs, Node root) {
                     .removeGlobals(options.removeUnusedVars)
                     .preserveFunctionExpressionNames(preserveAnonymousFunctionNames)
                     .removeUnusedPrototypeProperties(options.removeUnusedPrototypeProperties)
-                    .allowRemovalOfExternProperties(
-                        options.removeUnusedPrototypePropertiesInExterns)
+                    .allowRemovalOfExternProperties(false)
                     .removeUnusedThisProperties(options.isRemoveUnusedClassProperties())
                     .removeUnusedObjectDefinePropertiesDefinitions(
                         options.isRemoveUnusedClassProperties())
@@ -2462,9 +2461,7 @@ public void process(Node externs, Node root) {
                   new CrossChunkMethodMotion(
                       compiler,
                       compiler.getCrossModuleIdGenerator(),
-                      // Only move properties in externs if we're not treating
-                      // them as exports.
-                      options.removeUnusedPrototypePropertiesInExterns,
+                      /* canModifyExterns= */ false, // remove this
                       options.crossChunkCodeMotionNoStubMethods))
           .setFeatureSetForOptimizations()
           .build();

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

@@ -128,7 +128,7 @@ void maybeExposeExpression(Node expression) {
    * <p>This method should not be called from outside of this class. Instead call {@link
    * #maybeExposeExpression(Node)}.
    */
-  void exposeExpression(Node expression) {
+  private void exposeExpression(Node expression) {
     Node expressionRoot = findExpressionRoot(expression);
     checkNotNull(expressionRoot);
     checkState(NodeUtil.isStatement(expressionRoot), expressionRoot);

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

@@ -444,6 +444,7 @@ private void collect(JSModule module, Scope scope, Node n) {
           type = getValueType(n.getFirstChild());
           break;
         case NAME:
+        case GETPROP:
           // TODO(b/127505242): CAST parents may indicate a set.
           // This may be a variable get or set.
           switch (parent.getToken()) {
@@ -492,7 +493,9 @@ private void collect(JSModule module, Scope scope, Node n) {
             case ITER_REST:
             case OBJECT_REST:
               // This may be a set.
-              if (NodeUtil.isLhsByDestructuring(n)) {
+              // TODO(b/120303257): this should extend to qnames too, but doing
+              // so causes invalid output. Covered in CollapsePropertiesTest
+              if (n.isName() && NodeUtil.isLhsByDestructuring(n)) {
                 isSet = true;
                 type = NameType.OTHER;
               }
@@ -506,42 +509,12 @@ private void collect(JSModule module, Scope scope, Node n) {
                 type = NameType.OTHER;
               }
           }
-          name = n.getString();
-          break;
-        case GETPROP:
-          // TODO(b/117673791): Merge this case with NAME case to fix.
-          // TODO(b/120303257): Merging this case with the NAME case makes this a breaking bug.
-          // TODO(b/127505242): CAST parents may indicate a set.
-          // This may be a namespaced name get or set.
-          if (parent != null) {
-            switch (parent.getToken()) {
-              case ASSIGN:
-                if (parent.getFirstChild() == n) {
-                  isSet = true;
-                  type = getValueType(n.getNext());
-                }
-                break;
-              case GETPROP:
-                // This is nested in another getprop. Return and only create a Ref for the outermost
-                // getprop in the chain.
-                return;
-              case INC:
-              case DEC:
-              case ITER_SPREAD:
-              case OBJECT_SPREAD:
-                break; // isSet = false, type = OTHER.
-              default:
-                if (NodeUtil.isAssignmentOp(parent) && parent.getFirstChild() == n) {
-                  isSet = true;
-                  type = NameType.OTHER;
-                }
-            }
-          }
           if (!n.isQualifiedName()) {
             return;
           }
           name = n.getQualifiedName();
           break;
+
         case CALL:
           if (isObjectHasOwnPropertyCall(n)) {
             String qname = n.getFirstFirstChild().getQualifiedName();

src/com/google/javascript/jscomp/colors/Color.java

@@ -25,5 +25,7 @@ public interface Color {
 
   boolean isUnion();
 
+  boolean isObject();
+
   ImmutableCollection<Color> getAlternates();
 }

src/com/google/javascript/jscomp/colors/ObjectColor.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020 The Closure Compiler Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.javascript.jscomp.colors;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableCollection;
+
+/**
+ * A user-defined object type. For now each type is defined by a unique class name and file source.
+ */
+@AutoValue
+public abstract class ObjectColor implements Color {
+
+  public static ObjectColor create(String className, String fileName) {
+    return new AutoValue_ObjectColor(className, fileName);
+  }
+
+  @Override
+  public boolean isPrimitive() {
+    return false;
+  }
+
+  @Override
+  public boolean isUnion() {
+    return false;
+  }
+
+  @Override
+  public boolean isObject() {
+    return true;
+  }
+
+  @Override
+  public ImmutableCollection<Color> getAlternates() {
+    throw new UnsupportedOperationException();
+  }
+
+  public abstract String getClassName();
+
+  public abstract String getFilename();
+}