This is an archive of the discontinued LLVM Phabricator instance.

Differential D94463

[Driver] Fix assertion failure when -fprofile-generate -fcs-profile-generate are used together
ClosedPublic

Authored by MaskRay on Jan 11 2021, 6:27 PM.

Details

Reviewers
xur
Commits
rGcf45731f0eae: [Driver] Fix assertion failure when -fprofile-generate -fcs-profile-generate…
Summary

If conflicting -fprofile-generate -fcs-profile-generate are used together,
there is currently an assertion failure. Fix the failure.

Also add some driver tests.

Diff Detail

Unit TestsFailed

TimeTest
110 msx64 windows > Clang.Driver::fcs-profile-generate.c

Event Timeline

MaskRay requested review of this revision.Jan 11 2021, 6:27 PM
MaskRay created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 11 2021, 6:27 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B84785: Diff 315976.Jan 11 2021, 7:00 PM
MaskRay updated this revision to Diff 316233.Jan 12 2021, 2:02 PM
MaskRay retitled this revision from [Driver] Make -fcs-profile-generate require -fprofile-use to [Driver] Fix assertion failure when -fprofile-generate -fcs-profile-generate are used together.
MaskRay edited the summary of this revision. (Show Details)

.

xur accepted this revision.Jan 12 2021, 2:10 PM

looks good to me. Thanks for working on this.

This revision is now accepted and ready to land.Jan 12 2021, 2:10 PM
MaskRay updated this revision to Diff 316238.Jan 12 2021, 2:19 PM

Fix test on Windows

This revision was landed with ongoing or failed builds.Jan 12 2021, 2:20 PM
Closed by commit rGcf45731f0eae: [Driver] Fix assertion failure when -fprofile-generate -fcs-profile-generate… (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rGcf45731f0eae: [Driver] Fix assertion failure when -fprofile-generate -fcs-profile-generate….
Harbormaster completed remote builds in B84917: Diff 316233.Jan 12 2021, 2:46 PM
Harbormaster completed remote builds in B84921: Diff 316238.Jan 12 2021, 2:53 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
7 lines
test/
Driver/
12 lines

Diff 315976

clang/lib/Driver/ToolChains/Clang.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 760 Lines • ▼ Show 20 Linesstatic void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
if (PGOGenerateArg && ProfileUseArg) if (PGOGenerateArg && ProfileUseArg)
D.Diag(diag::err_drv_argument_not_allowed_with) D.Diag(diag::err_drv_argument_not_allowed_with)
<< ProfileUseArg->getSpelling() << PGOGenerateArg->getSpelling(); << ProfileUseArg->getSpelling() << PGOGenerateArg->getSpelling();
if (ProfileGenerateArg && ProfileUseArg) if (ProfileGenerateArg && ProfileUseArg)
D.Diag(diag::err_drv_argument_not_allowed_with) D.Diag(diag::err_drv_argument_not_allowed_with)
<< ProfileGenerateArg->getSpelling() << ProfileUseArg->getSpelling(); << ProfileGenerateArg->getSpelling() << ProfileUseArg->getSpelling();
if (CSPGOGenerateArg && PGOGenerateArg) if (CSPGOGenerateArg && PGOGenerateArg) {
D.Diag(diag::err_drv_argument_not_allowed_with) D.Diag(diag::err_drv_argument_not_allowed_with)
<< CSPGOGenerateArg->getSpelling() << PGOGenerateArg->getSpelling(); << CSPGOGenerateArg->getSpelling() << PGOGenerateArg->getSpelling();
PGOGenerateArg = nullptr;
}
if (CSPGOGenerateArg && !ProfileUseArg)
D.Diag(diag::err_drv_argument_only_allowed_with)
<< CSPGOGenerateArg->getSpelling() << "-fprofile-use";
if (ProfileGenerateArg) { if (ProfileGenerateArg) {
if (ProfileGenerateArg->getOption().matches( if (ProfileGenerateArg->getOption().matches(
options::OPT_fprofile_instr_generate_EQ)) options::OPT_fprofile_instr_generate_EQ))
CmdArgs.push_back(Args.MakeArgString(Twine("-fprofile-instrument-path=") + CmdArgs.push_back(Args.MakeArgString(Twine("-fprofile-instrument-path=") +
ProfileGenerateArg->getValue())); ProfileGenerateArg->getValue()));
// The default is to use Clang Instrumentation. // The default is to use Clang Instrumentation.
CmdArgs.push_back("-fprofile-instrument=clang"); CmdArgs.push_back("-fprofile-instrument=clang");
▲ Show 20 Lines • Show All 6,678 Lines • Show Last 20 Lines

clang/test/Driver/fcs-profile-generate.c

  • This file was added.
// RUN: %clang -### -c -fprofile-use=a.profdata -fcs-profile-generate %s 2>&1 | FileCheck %s
// CHECK: "-fprofile-instrument=csllvm" "-fprofile-instrument-use-path=a.profdata"
// RUN: %clang -### -c -fprofile-use=a.profdata -fcs-profile-generate=dir %s 2>&1 | FileCheck %s --check-prefix=CHECK1
// CHECK1: "-fprofile-instrument=csllvm" "-fprofile-instrument-path=dir/default_%m.profraw" "-fprofile-instrument-use-path=a.profdata"
// RUN: %clang -### -c -fcs-profile-generate %s 2>&1 | FileCheck %s --check-prefix=NOUSE
// NOUSE: error: invalid argument '-fcs-profile-generate' only allowed with '-fprofile-use'
// RUN: %clang -### -c -fprofile-generate -fcs-profile-generate %s 2>&1 | FileCheck %s --check-prefix=CONFLICT
// CONFLICT: error: invalid argument '-fcs-profile-generate' not allowed with '-fprofile-generate'
// CONFLICT: error: invalid argument '-fcs-profile-generate' only allowed with '-fprofile-use'