C++: Renames CppCompilationContext to CcCompilationInfo

This is in preparation for migrating to the new way of specifying providers as described in[]

RELNOTES:none
PiperOrigin-RevId: 186436462

7 files changed, 44 insertions, 40 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
index 075d4e7c4c..2941a8019e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
@@ -25,7 +25,7 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.packages.License.LicenseType;
-import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
+import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo;
 import java.util.Set;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@ public class AliasTest extends BuildViewTestCase {
         "alias(name='b', actual='a')");
 
     ConfiguredTarget b = getConfiguredTarget("//a:b");
-    assertThat(b.getProvider(CppCompilationContext.class)).isNotNull();
+    assertThat(b.getProvider(CcCompilationInfo.class)).isNotNull();
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 20ffd4015e..48abcf6238 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -249,7 +249,7 @@ public class CcCommonTest extends BuildViewTestCase {
             "cc_library(name = 'defineslib',",
             "           srcs = ['defines.cc'],",
             "           defines = ['FOO', 'BAR'])");
-    assertThat(isolatedDefines.getProvider(CppCompilationContext.class).getDefines())
+    assertThat(isolatedDefines.getProvider(CcCompilationInfo.class).getDefines())
         .containsExactly("FOO", "BAR")
         .inOrder();
   }
@@ -415,7 +415,7 @@ public class CcCommonTest extends BuildViewTestCase {
     ConfiguredTarget foo = getConfiguredTarget("//bang:bang");
 
     String includesRoot = "bang/bang_includes";
-    assertThat(foo.getProvider(CppCompilationContext.class).getSystemIncludeDirs())
+    assertThat(foo.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
         .containsAllOf(
             PathFragment.create(includesRoot),
             targetConfig.getGenfilesFragment().getRelative(includesRoot));
@@ -442,11 +442,11 @@ public class CcCommonTest extends BuildViewTestCase {
     String includesRoot = "bang/bang_includes";
     List<PathFragment> expected =
         new ImmutableList.Builder<PathFragment>()
-            .addAll(noIncludes.getProvider(CppCompilationContext.class).getSystemIncludeDirs())
+            .addAll(noIncludes.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
             .add(PathFragment.create(includesRoot))
             .add(targetConfig.getGenfilesFragment().getRelative(includesRoot))
             .build();
-    assertThat(foo.getProvider(CppCompilationContext.class).getSystemIncludeDirs())
+    assertThat(foo.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
         .containsExactlyElementsIn(expected);
   }
 
@@ -855,11 +855,14 @@ public class CcCommonTest extends BuildViewTestCase {
         "cc_library(name='a', hdrs=['v1/b/c.h'], strip_include_prefix='v1', include_prefix='lib')");
 
     ConfiguredTarget lib = getConfiguredTarget("//third_party/a");
-    CppCompilationContext context = lib.getProvider(CppCompilationContext.class);
-    assertThat(ActionsTestUtil.prettyArtifactNames(context.getDeclaredIncludeSrcs()))
+    CcCompilationInfo ccCompilationInfo = lib.getProvider(CcCompilationInfo.class);
+    assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .containsExactly("third_party/a/_virtual_includes/a/lib/b/c.h");
-    assertThat(context.getIncludeDirs()).containsExactly(
-        getTargetConfiguration().getBinFragment().getRelative("third_party/a/_virtual_includes/a"));
+    assertThat(ccCompilationInfo.getIncludeDirs())
+        .containsExactly(
+            getTargetConfiguration()
+                .getBinFragment()
+                .getRelative("third_party/a/_virtual_includes/a"));
   }
 
   @Test
@@ -891,10 +894,10 @@ public class CcCommonTest extends BuildViewTestCase {
         "cc_library(name='relative', hdrs=['v1/b.h'], strip_include_prefix='v1')",
         "cc_library(name='absolute', hdrs=['v1/b.h'], strip_include_prefix='/third_party')");
 
-    CppCompilationContext relative = getConfiguredTarget("//third_party/a:relative")
-        .getProvider(CppCompilationContext.class);
-    CppCompilationContext absolute = getConfiguredTarget("//third_party/a:absolute")
-        .getProvider(CppCompilationContext.class);
+    CcCompilationInfo relative =
+        getConfiguredTarget("//third_party/a:relative").getProvider(CcCompilationInfo.class);
+    CcCompilationInfo absolute =
+        getConfiguredTarget("//third_party/a:absolute").getProvider(CcCompilationInfo.class);
 
     assertThat(ActionsTestUtil.prettyArtifactNames(relative.getDeclaredIncludeSrcs()))
         .containsExactly("third_party/a/_virtual_includes/relative/b.h");
@@ -921,9 +924,9 @@ public class CcCommonTest extends BuildViewTestCase {
         "licenses(['notice'])",
         "cc_library(name='a', hdrs=['a.h'], include_prefix='third_party')");
 
-    CppCompilationContext context =
-        getConfiguredTarget("//third_party:a").getProvider(CppCompilationContext.class);
-    assertThat(ActionsTestUtil.prettyArtifactNames(context.getDeclaredIncludeSrcs()))
+    CcCompilationInfo ccCompilationInfo =
+        getConfiguredTarget("//third_party:a").getProvider(CcCompilationInfo.class);
+    assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .doesNotContain("third_party/_virtual_includes/a/third_party/a.h");
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
index 3c74296333..864475d1f4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
@@ -283,7 +283,7 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase {
                 "a",
                 "foo",
                 "cc_import(name = 'foo', static_library = 'libfoo.a', hdrs = ['foo.h'])")
-            .getProvider(CppCompilationContext.class)
+            .getProvider(CcCompilationInfo.class)
             .getDeclaredIncludeSrcs();
     assertThat(artifactsToStrings(headers)).containsExactly("src a/foo.h");
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index 36fcadf028..0504464bc7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -91,13 +91,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
 
   private CppModuleMapAction getCppModuleMapAction(String label) throws Exception {
     ConfiguredTarget target = getConfiguredTarget(label);
-    CppModuleMap cppModuleMap = target.getProvider(CppCompilationContext.class).getCppModuleMap();
+    CppModuleMap cppModuleMap = target.getProvider(CcCompilationInfo.class).getCppModuleMap();
     return (CppModuleMapAction) getGeneratingAction(cppModuleMap.getArtifact());
   }
 
   private void assertNoCppModuleMapAction(String label) throws Exception {
     ConfiguredTarget target = getConfiguredTarget(label);
-    assertThat(target.getProvider(CppCompilationContext.class).getCppModuleMap()).isNull();
+    assertThat(target.getProvider(CcCompilationInfo.class).getCppModuleMap()).isNull();
   }
 
   @Test
@@ -105,7 +105,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     ConfiguredTarget l = scratchConfiguredTarget("a", "l",
         "cc_library(name='l', srcs=['l.cc'], defines=['V=$(FOO)'], toolchains=[':v'])",
         "make_variable_tester(name='v', variables={'FOO': 'BAR'})");
-    assertThat(l.getProvider(CppCompilationContext.class).getDefines()).contains("V=BAR");
+    assertThat(l.getProvider(CcCompilationInfo.class).getDefines()).contains("V=BAR");
   }
 
   @Test
@@ -556,8 +556,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     CppCompileAction aObjectAction = (CppCompileAction) getGeneratingAction(aObjectArtifact);
     assertThat(aObjectAction.getIncludeScannerSources()).containsExactly(
         getSourceArtifact("module/a.cc"));
-    assertThat(aObjectAction.getContext().getTransitiveModules(true)).contains(
-        getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
+    assertThat(aObjectAction.getCcCompilationInfo().getTransitiveModules(true))
+        .contains(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
     assertThat(aObjectAction.getInputs()).contains(
         getGenfilesArtifactWithNoOwner("module/b.cppmap"));
     assertNoEvents();
@@ -692,7 +692,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     getConfiguredTarget("//module:j");
     Artifact jObjectArtifact = getBinArtifact("_objs/j/module/j.pic.o", "//module:j");
     CppCompileAction jObjectAction = (CppCompileAction) getGeneratingAction(jObjectArtifact);
-    assertThat(getHeaderModules(jObjectAction.getContext().getTransitiveModules(true)))
+    assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true)))
         .containsExactly(
             getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"),
             getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g"));
@@ -700,7 +700,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         getSourceArtifact("module/j.cc"));
     assertThat(jObjectAction.getMainIncludeScannerSource()).isEqualTo(
         getSourceArtifact("module/j.cc"));
-    assertThat(getHeaderModules(jObjectAction.getContext().getTransitiveModules(true)))
+    assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true)))
         .containsExactly(
             getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"),
             getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g"));
@@ -730,9 +730,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         .containsExactly(
             getGenfilesArtifact("b.cppmap", "//module:b"),
             getGenfilesArtifact("c.cppmap", "//nomodule:e"));
-    assertThat(getHeaderModules(cObjectAction.getContext().getTransitiveModules(true)))
+    assertThat(getHeaderModules(cObjectAction.getCcCompilationInfo().getTransitiveModules(true)))
         .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
-    
+
     getConfiguredTarget("//nomodule:d");
     Artifact dObjectArtifact = getBinArtifact("_objs/d/nomodule/d.pic.o", "//nomodule:d");
     CppCompileAction dObjectAction = (CppCompileAction) getGeneratingAction(dObjectArtifact);
@@ -740,7 +740,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         .containsExactly(
             getGenfilesArtifact("c.cppmap", "//nomodule:c"),
             getGenfilesArtifact("d.cppmap", "//nomodule:d"));
-    assertThat(getHeaderModules(dObjectAction.getContext().getTransitiveModules(true)))
+    assertThat(getHeaderModules(dObjectAction.getCcCompilationInfo().getTransitiveModules(true)))
         .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
index a6b67737c7..786fe8dd09 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
@@ -56,7 +56,7 @@ public class CcToolchainProviderTest {
             NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
             null,
             PathFragment.EMPTY_FRAGMENT,
-            CppCompilationContext.EMPTY,
+            CcCompilationInfo.EMPTY,
             false,
             false,
             Variables.EMPTY,
@@ -89,7 +89,7 @@ public class CcToolchainProviderTest {
             NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
             null,
             PathFragment.EMPTY_FRAGMENT,
-            CppCompilationContext.EMPTY,
+            CcCompilationInfo.EMPTY,
             false,
             false,
             Variables.EMPTY,
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
index f24693f6b6..2e2befec2f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.rules.cpp.CppCompilationContext.Builder;
+import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo.Builder;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
 import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.SingletonCodec;
@@ -43,7 +43,7 @@ public final class MockCppSemantics implements CppSemantics {
       RuleContext ruleContext, CppCompileActionBuilder actionBuilder) {}
 
   @Override
-  public void setupCompilationContext(RuleContext ruleContext, Builder contextBuilder) {}
+  public void setupCcCompilationInfo(RuleContext ruleContext, Builder ccCompilationInfoBuilder) {}
 
   @Override
   public NestedSet<Artifact> getAdditionalPrunableIncludes() {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
index 0bbef79a00..5b0ae77f04 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
@@ -23,7 +23,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
+import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -106,22 +106,23 @@ public class CcProtoLibraryTest extends BuildViewTestCase {
         "proto_library(name = 'alias_proto', deps = [':foo_proto'])",
         "proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
 
-    CppCompilationContext context =
-        getConfiguredTarget("//x:foo_cc_proto").getProvider(CppCompilationContext.class);
-    assertThat(prettyArtifactNames(context.getDeclaredIncludeSrcs())).containsExactly("x/foo.pb.h");
+    CcCompilationInfo ccCompilationInfo =
+        getConfiguredTarget("//x:foo_cc_proto").getProvider(CcCompilationInfo.class);
+    assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
+        .containsExactly("x/foo.pb.h");
   }
 
   @Test
-  public void cppCompilationContext() throws Exception {
+  public void ccCompilationInfo() throws Exception {
     scratch.file(
         "x/BUILD",
         "cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
         "proto_library(name = 'foo_proto', srcs = ['foo.proto'], deps = [':bar_proto'])",
         "proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
 
-    CppCompilationContext context =
-        getConfiguredTarget("//x:foo_cc_proto").getProvider(CppCompilationContext.class);
-    assertThat(prettyArtifactNames(context.getDeclaredIncludeSrcs()))
+    CcCompilationInfo ccCompilationInfo =
+        getConfiguredTarget("//x:foo_cc_proto").getProvider(CcCompilationInfo.class);
+    assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .containsExactly("x/foo.pb.h", "x/bar.pb.h");
   }