Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/test/tools/llc/new-pm/option-conflict.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; RUN: not llc -mtriple=x86_64-pc-linux-gnu -passes=foo -start-before=mergeicmps -stop-after=gc-lowering -filetype=null %s 2>&1 | FileCheck %s

; CHECK: warning: --passes cannot be used with start-before and stop-after.
; CHECK: error: --passes cannot be used with start-before and stop-after.
4 changes: 2 additions & 2 deletions llvm/tools/llc/NewPMDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ int llvm::compileModuleWithNewPM(
CodeGenFileType FileType) {

if (!PassPipeline.empty() && TargetPassConfig::hasLimitedCodeGenPipeline()) {
WithColor::warning(errs(), Arg0)
WithColor::error(errs(), Arg0)
<< "--passes cannot be used with "
<< TargetPassConfig::getLimitedCodeGenPipelineReason() << ".\n";
return 1;
Expand Down Expand Up @@ -139,7 +139,7 @@ int llvm::compileModuleWithNewPM(
// selection.

if (!MIR) {
WithColor::warning(errs(), Arg0) << "-passes is for .mir file only.\n";
WithColor::error(errs(), Arg0) << "-passes is for .mir file only.\n";
return 1;
}

Expand Down
4 changes: 2 additions & 2 deletions llvm/tools/llc/llc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -692,15 +692,15 @@ static int compileModule(char **argv, LLVMContext &Context) {
// selection.
if (!getRunPassNames().empty()) {
if (!MIR) {
WithColor::warning(errs(), argv[0])
WithColor::error(errs(), argv[0])
<< "run-pass is for .mir file only.\n";
delete MMIWP;
return 1;
}
TargetPassConfig *PTPC = Target->createPassConfig(PM);
TargetPassConfig &TPC = *PTPC;
if (TPC.hasLimitedCodeGenPipeline()) {
WithColor::warning(errs(), argv[0])
WithColor::error(errs(), argv[0])
<< "run-pass cannot be used with "
<< TPC.getLimitedCodeGenPipelineReason() << ".\n";
delete PTPC;
Expand Down