replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make a codegen warning a real warning instead of a getCustomDiagID(). 

Warnings shouldn't use getCustomDiagID(), since then they can't be disabled
via a flag, can't be remapped, etc.

llvm-svn: 227420
This commit is contained in:
Nico Weber 2015-01-29 06:25:59 +00:00
parent 9a435729b4
commit 6cf2df29e7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/DiagnosticFrontendKinds.td
View File

@ -35,6 +35,10 @@ def err_fe_backend_plugin: Error<"%0">, BackendInfo;
def remark_fe_backend_plugin: Remark<"%0">, BackendInfo, InGroup<RemarkBackendPlugin>; def remark_fe_backend_plugin: Remark<"%0">, BackendInfo, InGroup<RemarkBackendPlugin>;
def note_fe_backend_plugin: Note<"%0">, BackendInfo; def note_fe_backend_plugin: Note<"%0">, BackendInfo;
def warn_fe_override_module : Warning<
"overriding the module target triple with %0">,
InGroup<DiagGroup<"override-module">>;
def remark_fe_backend_optimization_remark : Remark<"%0">, BackendInfo, def remark_fe_backend_optimization_remark : Remark<"%0">, BackendInfo,
InGroup<BackendOptimizationRemark>; InGroup<BackendOptimizationRemark>;
def remark_fe_backend_optimization_remark_missed : Remark<"%0">, BackendInfo, def remark_fe_backend_optimization_remark_missed : Remark<"%0">, BackendInfo,

8
clang/lib/CodeGen/CodeGenAction.cpp
View File

@ -709,11 +709,9 @@ void CodeGenAction::ExecuteAction() {
} }
const TargetOptions &TargetOpts = CI.getTargetOpts(); const TargetOptions &TargetOpts = CI.getTargetOpts();
if (TheModule->getTargetTriple() != TargetOpts.Triple) { if (TheModule->getTargetTriple() != TargetOpts.Triple) {
unsigned DiagID = CI.getDiagnostics().getCustomDiagID( CI.getDiagnostics().Report(SourceLocation(),
DiagnosticsEngine::Warning, diag::warn_fe_override_module)
"overriding the module target triple with %0"); << TargetOpts.Triple;
CI.getDiagnostics().Report(SourceLocation(), DiagID) << TargetOpts.Triple;
TheModule->setTargetTriple(TargetOpts.Triple); TheModule->setTargetTriple(TargetOpts.Triple);
} }