Skip to content

Commit ffd06a6

Browse files
pzembrodcopybara-github
authored andcommitted
Inline CcCommon.getPurpose() incl. creation of CcCommon into CcModule.compile().
PiperOrigin-RevId: 753159650 Change-Id: I76e910f237e2e65734bd9cf2a1aa4e903c238529
1 parent c1abaa0 commit ffd06a6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,6 @@ public Sequence<String> getLooseIncludeDirsForStarlark() {
326326
return StarlarkList.empty();
327327
}
328328

329-
public String getPurpose(CppSemantics semantics) {
330-
return semantics.getClass().getSimpleName()
331-
+ "_build_arch_"
332-
+ ruleContext.getConfiguration().getMnemonic();
333-
}
334-
335329
public static ImmutableList<String> getCoverageFeatures(CppConfiguration cppConfiguration) {
336330
ImmutableList.Builder<String> coverageFeatures = ImmutableList.builder();
337331
if (cppConfiguration.collectCodeCoverage()) {

src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,7 +2065,10 @@ public Tuple compile(
20652065

20662066
SourceCategory sourceCategory =
20672067
(language == Language.CPP) ? SourceCategory.CC : SourceCategory.CC_AND_OBJC;
2068-
CcCommon common = new CcCommon(actions.getRuleContext());
2068+
String defaultPurpose =
2069+
getSemantics(language).getClass().getSimpleName()
2070+
+ "_build_arch_"
2071+
+ actions.getRuleContext().getConfiguration().getMnemonic();
20692072
BuildConfigurationValue configuration = actions.getRuleContext().getConfiguration();
20702073
List<String> includes =
20712074
starlarkIncludes instanceof Depset
@@ -2121,7 +2124,7 @@ public Tuple compile(
21212124
Sequence.cast(additionalInputs, Artifact.class, "additional_inputs"))
21222125
.addAdditionalInputs(nonCompilationAdditionalInputs)
21232126
.addAdditionalIncludeScanningRoots(includeScanningRoots)
2124-
.setPurpose(common.getPurpose(getSemantics(language)))
2127+
.setPurpose(defaultPurpose)
21252128
.addAdditionalExportedHeaders(
21262129
additionalExportedHeaders.stream().map(PathFragment::create).collect(toImmutableList()))
21272130
.setPropagateModuleMapToCompileAction(propagateModuleMapToCompileAction)
@@ -2308,7 +2311,10 @@ public Tuple compileFork(
23082311
(language == Language.CPP)
23092312
? CcStaticCompilationHelper.SourceCategory.CC
23102313
: CcStaticCompilationHelper.SourceCategory.CC_AND_OBJC;
2311-
CcCommon common = new CcCommon(actions.getRuleContext());
2314+
String defaultPurpose =
2315+
getSemantics(language).getClass().getSimpleName()
2316+
+ "_build_arch_"
2317+
+ actions.getRuleContext().getConfiguration().getMnemonic();
23122318
BuildConfigurationValue configuration = actions.getRuleContext().getConfiguration();
23132319
List<String> includes =
23142320
starlarkIncludes instanceof Depset
@@ -2364,7 +2370,7 @@ public Tuple compileFork(
23642370
Sequence.cast(additionalInputs, Artifact.class, "additional_inputs"))
23652371
.addAdditionalInputs(nonCompilationAdditionalInputs)
23662372
.addAdditionalIncludeScanningRoots(includeScanningRoots)
2367-
.setPurpose(common.getPurpose(getSemantics(language)))
2373+
.setPurpose(defaultPurpose)
23682374
.addAdditionalExportedHeaders(
23692375
additionalExportedHeaders.stream().map(PathFragment::create).collect(toImmutableList()))
23702376
.setPropagateModuleMapToCompileAction(propagateModuleMapToCompileAction)

0 commit comments

Comments
 (0)