Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor createSourceAction #22744

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor createSourceAction #22744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
234 changes: 117 additions & 117 deletions src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,8 +1503,7 @@ private ImmutableList<Artifact> createModuleAction(
/* bitcodeOutput= */ false);
}

@CanIgnoreReturnValue
private ImmutableList<Artifact> createSourceAction(
private Artifact createSourceActionHelper(
Label sourceLabel,
String outputName,
CcCompilationOutputs.Builder result,
Expand All @@ -1515,67 +1514,60 @@ private ImmutableList<Artifact> createSourceAction(
boolean addObject,
boolean enableCoverage,
boolean generateDwo,
boolean bitcodeOutput)
boolean bitcodeOutput,
PathFragment ccRelativeName,
boolean usePic,
ImmutableMap<String, String> additionalBuildVariables)
throws RuleErrorException, EvalException, InterruptedException {
ImmutableList.Builder<Artifact> directOutputs = new ImmutableList.Builder<>();
PathFragment ccRelativeName = sourceArtifact.getRootRelativePath();
Artifact outputFile = builder.getOutputFile();
builder.setOutputs(
actionConstructionContext, ruleErrorConsumer, label, outputCategory, outputName);
String gcnoFileName =
CppHelper.getArtifactNameForCategory(
ccToolchain, ArtifactCategory.COVERAGE_DATA_FILE, outputName);

// Create PIC compile actions (same as no-PIC, but use -fPIC and
// generate .pic.o, .pic.d, .pic.gcno instead of .o, .d, .gcno.)
if (generatePicAction) {
String picOutputBase =
CppHelper.getArtifactNameForCategory(ccToolchain, ArtifactCategory.PIC_FILE, outputName);
CppCompileActionBuilder picBuilder = copyAsPicBuilder(builder, picOutputBase, outputCategory);
String gcnoFileName =
CppHelper.getArtifactNameForCategory(
ccToolchain, ArtifactCategory.COVERAGE_DATA_FILE, picOutputBase);
Artifact gcnoFile =
enableCoverage && !cppConfiguration.useLLVMCoverageMapFormat()
? CppHelper.getCompileOutputArtifact(
actionConstructionContext, label, gcnoFileName, configuration)
: null;
Artifact dwoFile =
generateDwo && !bitcodeOutput ? getDwoFile(picBuilder.getOutputFile()) : null;
Artifact ltoIndexingFile =
bitcodeOutput ? getLtoIndexingFile(picBuilder.getOutputFile()) : null;

picBuilder.setVariables(
setupCompileBuildVariables(
picBuilder,
sourceLabel,
/* usePic= */ true,
/* needsFdoBuildVariables= */ ccRelativeName != null && addObject,
cppModuleMap,
enableCoverage,
gcnoFile,
generateDwo,
dwoFile,
ltoIndexingFile,
/* additionalBuildVariables= */ ImmutableMap.of()));
Artifact gcnoFile =
enableCoverage && !cppConfiguration.useLLVMCoverageMapFormat()
? CppHelper.getCompileOutputArtifact(
actionConstructionContext, label, gcnoFileName, configuration)
: null;

result.addTemps(
createTempsActions(
sourceArtifact,
sourceLabel,
outputName,
picBuilder,
/* usePic= */ true,
ccRelativeName));
Artifact dwoFile = generateDwo && !bitcodeOutput ? getDwoFile(outputFile) : null;
Artifact ltoIndexingFile = bitcodeOutput ? getLtoIndexingFile(builder.getOutputFile()) : null;

picBuilder.setGcnoFile(gcnoFile);
picBuilder.setDwoFile(dwoFile);
picBuilder.setLtoIndexingFile(ltoIndexingFile);
builder.setVariables(
setupCompileBuildVariables(
builder,
sourceLabel,
usePic,
/* needsFdoBuildVariables= */ ccRelativeName != null,
cppModuleMap,
enableCoverage,
gcnoFile,
generateDwo,
dwoFile,
ltoIndexingFile,
additionalBuildVariables));

result.addTemps(
createTempsActions(
sourceArtifact, sourceLabel, outputName, builder, usePic, ccRelativeName));

builder.setGcnoFile(gcnoFile);
builder.setDwoFile(dwoFile);
builder.setLtoIndexingFile(ltoIndexingFile);

semantics.finalizeCompileActionBuilder(configuration, featureConfiguration, picBuilder);
CppCompileAction picAction = picBuilder.buildOrThrowRuleError(ruleErrorConsumer);
actionConstructionContext.registerAction(picAction);
directOutputs.add(picAction.getPrimaryOutput());
semantics.finalizeCompileActionBuilder(configuration, featureConfiguration, builder);
CppCompileAction compileAction = builder.buildOrThrowRuleError(ruleErrorConsumer);
actionConstructionContext.registerAction(compileAction);
Artifact objectFile = compileAction.getPrimaryOutput();
if (usePic) {
if (addObject) {
result.addPicObjectFile(picAction.getPrimaryOutput());
result.addPicObjectFile(objectFile);

if (bitcodeOutput) {
result.addLtoBitcodeFile(
picAction.getPrimaryOutput(), ltoIndexingFile, getCopts(sourceArtifact, sourceLabel));
objectFile, ltoIndexingFile, getCopts(sourceArtifact, sourceLabel));
}
}
if (dwoFile != null) {
Expand All @@ -1585,82 +1577,90 @@ private ImmutableList<Artifact> createSourceAction(
if (gcnoFile != null) {
result.addPicGcnoFile(gcnoFile);
}
if (outputCategory == ArtifactCategory.CPP_MODULE) {
result.addModuleFile(picAction.getPrimaryOutput());
}
}

if (generateNoPicAction) {
Artifact noPicOutputFile =
CppHelper.getCompileOutputArtifact(
actionConstructionContext,
label,
CppHelper.getArtifactNameForCategory(ccToolchain, outputCategory, outputName),
configuration);
builder.setOutputs(
actionConstructionContext, ruleErrorConsumer, label, outputCategory, outputName);
String gcnoFileName =
CppHelper.getArtifactNameForCategory(
ccToolchain, ArtifactCategory.COVERAGE_DATA_FILE, outputName);

// Create no-PIC compile actions
Artifact gcnoFile =
enableCoverage && !cppConfiguration.useLLVMCoverageMapFormat()
? CppHelper.getCompileOutputArtifact(
actionConstructionContext, label, gcnoFileName, configuration)
: null;

Artifact noPicDwoFile = generateDwo && !bitcodeOutput ? getDwoFile(noPicOutputFile) : null;
Artifact ltoIndexingFile = bitcodeOutput ? getLtoIndexingFile(builder.getOutputFile()) : null;

builder.setVariables(
setupCompileBuildVariables(
builder,
sourceLabel,
/* usePic= */ false,
/* needsFdoBuildVariables= */ ccRelativeName != null,
cppModuleMap,
enableCoverage,
gcnoFile,
generateDwo,
noPicDwoFile,
ltoIndexingFile,
/* additionalBuildVariables= */ ImmutableMap.of()));

result.addTemps(
createTempsActions(
sourceArtifact,
sourceLabel,
outputName,
builder,
/* usePic= */ false,
ccRelativeName));

builder.setGcnoFile(gcnoFile);
builder.setDwoFile(noPicDwoFile);
builder.setLtoIndexingFile(ltoIndexingFile);

semantics.finalizeCompileActionBuilder(configuration, featureConfiguration, builder);
CppCompileAction compileAction = builder.buildOrThrowRuleError(ruleErrorConsumer);
actionConstructionContext.registerAction(compileAction);
Artifact objectFile = compileAction.getPrimaryOutput();
directOutputs.add(objectFile);
} else {
if (addObject) {
result.addObjectFile(objectFile);
if (bitcodeOutput) {
result.addLtoBitcodeFile(
objectFile, ltoIndexingFile, getCopts(sourceArtifact, sourceLabel));
}
}
if (noPicDwoFile != null) {
if (dwoFile != null) {
// Exec configuration targets don't produce .dwo files.
result.addDwoFile(noPicDwoFile);
result.addDwoFile(dwoFile);
}
if (gcnoFile != null) {
result.addGcnoFile(gcnoFile);
}
}
return objectFile;
}

@CanIgnoreReturnValue
private ImmutableList<Artifact> createSourceAction(
Label sourceLabel,
String outputName,
CcCompilationOutputs.Builder result,
Artifact sourceArtifact,
CppCompileActionBuilder builder,
ArtifactCategory outputCategory,
CppModuleMap cppModuleMap,
boolean addObject,
boolean enableCoverage,
boolean generateDwo,
boolean bitcodeOutput)
throws RuleErrorException, EvalException, InterruptedException {
ImmutableList.Builder<Artifact> directOutputs = new ImmutableList.Builder<>();
PathFragment ccRelativeName = sourceArtifact.getRootRelativePath();

// Create PIC compile actions (same as no-PIC, but use -fPIC and
// generate .pic.o, .pic.d, .pic.gcno instead of .o, .d, .gcno.)
if (generatePicAction) {
String picOutputBase =
CppHelper.getArtifactNameForCategory(ccToolchain, ArtifactCategory.PIC_FILE, outputName);
CppCompileActionBuilder picBuilder = copyAsPicBuilder(builder, picOutputBase, outputCategory);
Artifact picOutputFile =
createSourceActionHelper(
sourceLabel,
picOutputBase,
result,
sourceArtifact,
picBuilder,
outputCategory,
cppModuleMap,
addObject,
enableCoverage,
generateDwo,
bitcodeOutput,
ccRelativeName,
/* usePic= */ true,
/* additionalBuildVariables= */ ImmutableMap.of());
directOutputs.add(picOutputFile);
if (outputCategory == ArtifactCategory.CPP_MODULE) {
result.addModuleFile(picOutputFile);
}
}

if (generateNoPicAction) {
Artifact noPicOutputFile =
createSourceActionHelper(
sourceLabel,
outputName,
result,
sourceArtifact,
builder,
outputCategory,
cppModuleMap,
addObject,
enableCoverage,
generateDwo,
bitcodeOutput,
ccRelativeName,
/* usePic= */ false,
/* additionalBuildVariables= */ ImmutableMap.of());
directOutputs.add(noPicOutputFile);
if (outputCategory == ArtifactCategory.CPP_MODULE) {
result.addModuleFile(compileAction.getPrimaryOutput());
result.addModuleFile(noPicOutputFile);
}
}
return directOutputs.build();
Expand Down