Remove CppCompilationContext.equals/hashCode. Making them throw an exception

shows that they aren't actually used anymore. If they were, they wouldn't work
as expected as the nested sets that are used in the comparison don't implement
hashCode or equals.

--
MOS_MIGRATED_REVID=130945911

2 files changed, 1 insertions, 215 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
index a3efb3d7da..0a6e8b5248 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -90,7 +89,7 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
   // True if this context is for a compilation that should use header modules from dependencies.
   private final boolean useHeaderModules;
 
-  // Derived from depsContexts; no need to consider it for equals/hashCode.
+  // Derived from depsContexts.
   private final ImmutableSet<Artifact> compilationPrerequisites;
 
   private CppCompilationContext(
@@ -310,56 +309,6 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
     return commandLineContext.defines;
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof CppCompilationContext)) {
-      return false;
-    }
-    CppCompilationContext other = (CppCompilationContext) obj;
-    return Objects.equals(headerModule, other.headerModule)
-        && Objects.equals(cppModuleMap, other.cppModuleMap)
-        && Objects.equals(picHeaderModule, other.picHeaderModule)
-        && commandLineContext.equals(other.commandLineContext)
-        && Objects.equals(declaredIncludeDirs, other.declaredIncludeDirs)
-        && Objects.equals(declaredIncludeWarnDirs, other.declaredIncludeWarnDirs)
-        && Objects.equals(declaredIncludeSrcs, other.declaredIncludeSrcs)
-        && Objects.equals(directModuleMaps, other.directModuleMaps)
-        && Objects.equals(headerModuleSrcs, other.headerModuleSrcs)
-        && Objects.equals(impliedHeaderModules, other.impliedHeaderModules)
-        && Objects.equals(picImpliedHeaderModules, other.picImpliedHeaderModules)
-        && Objects.equals(topLevelHeaderModules, other.topLevelHeaderModules)
-        && Objects.equals(picTopLevelHeaderModules, other.picTopLevelHeaderModules)
-        && Objects.equals(transitiveModuleMaps, other.transitiveModuleMaps)
-        && Objects.equals(compilationPrerequisites, other.compilationPrerequisites)
-        && (provideTransitiveModuleMaps == other.provideTransitiveModuleMaps)
-        && (useHeaderModules == other.useHeaderModules);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        headerModule,
-        picHeaderModule,
-        commandLineContext,
-        declaredIncludeDirs,
-        declaredIncludeWarnDirs,
-        declaredIncludeSrcs,
-        directModuleMaps,
-        headerModuleSrcs,
-        impliedHeaderModules,
-        picImpliedHeaderModules,
-        transitiveModuleMaps,
-        topLevelHeaderModules,
-        picTopLevelHeaderModules,
-        compilationPrerequisites,
-        cppModuleMap,
-        provideTransitiveModuleMaps,
-        useHeaderModules);
-  }
-
   /**
    * Returns a context that is based on a given context but returns empty sets
    * for {@link #getDeclaredIncludeDirs()} and {@link #getDeclaredIncludeWarnDirs()}.
@@ -488,26 +437,6 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
       this.systemIncludeDirs = systemIncludeDirs;
       this.defines = defines;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == this) {
-        return true;
-      }
-      if (!(obj instanceof CommandLineContext)) {
-        return false;
-      }
-      CommandLineContext other = (CommandLineContext) obj;
-      return Objects.equals(includeDirs, other.includeDirs)
-          && Objects.equals(quoteIncludeDirs, other.quoteIncludeDirs)
-          && Objects.equals(systemIncludeDirs, other.systemIncludeDirs)
-          && Objects.equals(defines, other.defines);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(includeDirs, quoteIncludeDirs, systemIncludeDirs, defines);
-    }
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContextTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContextTest.java
deleted file mode 100644
index 95a99bce7c..0000000000
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContextTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// 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.devtools.build.lib.rules.cpp;
-
-import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.testing.EqualsTester;
-import com.google.devtools.build.lib.actions.MiddlemanFactory;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests for {@link CppCompilationContext}.
- */
-@RunWith(JUnit4.class)
-public class CppCompilationContextTest extends BuildViewTestCase {
-
-  @Before
-  public final void createBuildFile() throws Exception {
-    scratch.file("foo/BUILD",
-        "cc_binary(name = 'foo',",
-        "          srcs = ['foo.cc'])",
-        "cc_binary(name = 'bar',",
-        "          srcs = ['bar.cc'])");
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    MiddlemanFactory middlemanFactory = getTestAnalysisEnvironment().getMiddlemanFactory();
-    ConfiguredTarget fooBin = getConfiguredTarget("//foo:foo");
-    CppCompilationContext fooContextA1 = new CppCompilationContext.Builder(
-        getRuleContext(fooBin)).build(NULL_ACTION_OWNER, middlemanFactory);
-    CppCompilationContext fooContextA2 = new CppCompilationContext.Builder(
-        getRuleContext(fooBin)).build(NULL_ACTION_OWNER, middlemanFactory);
-    CppCompilationContext fooContextB = new CppCompilationContext.Builder(
-        getRuleContext(fooBin)).addDefine("a=b")
-            .build(NULL_ACTION_OWNER, middlemanFactory);
-    ConfiguredTarget barBin = getConfiguredTarget("//foo:bar");
-    // The fact that the configured target is different does not matter in this case.
-    CppCompilationContext barContext = new CppCompilationContext.Builder(
-        getRuleContext(barBin)).build(NULL_ACTION_OWNER, middlemanFactory);
-
-    CppCompilationContext fooContextWithModuleMap =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .setCppModuleMap(new CppModuleMap(getBinArtifact("foo/something.xyz", fooBin), "name"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-
-    CppCompilationContext fooContextWithCompilationPrerequisites =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .addCompilationPrerequisites(ImmutableList.of(getBinArtifact("foo/something.xyz", fooBin)))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-
-    CppCompilationContext fooContextWithModuleMapAndCompilationPrerequisites =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .addCompilationPrerequisites(ImmutableList.of(getBinArtifact("foo/something.xyz", fooBin)))
-        .setCppModuleMap(new CppModuleMap(getBinArtifact("foo/something.xyz", fooBin), "name"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-
-    CppCompilationContext fooContextWithInheritedModuleMapSameAsModuleMap =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .mergeDependentContext(fooContextWithModuleMap)
-        .setCppModuleMap(new CppModuleMap(getBinArtifact("foo/something.xyz", fooBin), "name"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-
-    CppCompilationContext fooContextWithHeaderModuleSrcs =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .addDeclaredIncludeSrc(getSourceArtifact("foo/foo.h"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextWithInheritedHeaderModuleSrcs =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .mergeDependentContext(fooContextWithHeaderModuleSrcs)
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextWithHeaderModule =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .setHeaderModule(getGenfilesArtifact("foo/something.pcm", fooBin))
-        .addDeclaredIncludeSrc(getSourceArtifact("foo/bar.h"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextWithPicHeaderModule =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .setPicHeaderModule(getGenfilesArtifact("foo/something.pcm", fooBin))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextWithInheritedHeaderModule =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .mergeDependentContext(fooContextWithHeaderModule)
-        .setHeaderModule(getGenfilesArtifact("foo/something.pcm", fooBin))
-        .addDeclaredIncludeSrc(getSourceArtifact("foo/bar.h"))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextWithTransitivelyInheritedHeaderModule =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-        .mergeDependentContext(fooContextWithInheritedHeaderModule)
-        .setHeaderModule(getGenfilesArtifact("foo/something.pcm", fooBin))
-        .build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextUsingHeaderModules =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-            .setProvideTransitiveModuleMaps(true).build(NULL_ACTION_OWNER, middlemanFactory);
-    
-    CppCompilationContext fooContextNotUsingHeaderModules =
-        new CppCompilationContext.Builder(getRuleContext(fooBin))
-            .setUseHeaderModules(true)
-            .build(NULL_ACTION_OWNER, middlemanFactory);
-
-    new EqualsTester()
-        .addEqualityGroup(fooContextA1, fooContextA2, barContext)
-        .addEqualityGroup(fooContextB)
-        .addEqualityGroup(fooContextWithModuleMap)
-        .addEqualityGroup(fooContextWithCompilationPrerequisites)
-        .addEqualityGroup(fooContextWithModuleMapAndCompilationPrerequisites)
-        .addEqualityGroup(fooContextWithInheritedModuleMapSameAsModuleMap)
-        .addEqualityGroup(fooContextWithHeaderModuleSrcs)
-        .addEqualityGroup(fooContextWithInheritedHeaderModuleSrcs)
-        .addEqualityGroup(fooContextWithHeaderModule)
-        .addEqualityGroup(fooContextWithPicHeaderModule)
-        .addEqualityGroup(fooContextWithInheritedHeaderModule)
-        .addEqualityGroup(fooContextWithTransitivelyInheritedHeaderModule)
-        .addEqualityGroup(fooContextUsingHeaderModules)
-        .addEqualityGroup(fooContextNotUsingHeaderModules)
-        .testEquals();
-  }
-}