maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Handle diagnostic warnings in Frontend diagnostic handler. 

Clang uses a diagnostic handler to grab diagnostic messages so it can print them
with the line of source code they refer to. This patch extends this to handle
diagnostic warnings that were added to llvm to produce a warning when
loop vectorization is explicitly specified (using a pragma clang loop directive)
but fails.

Reviewed by: Aaron Ballman

llvm-svn: 213112
This commit is contained in:
Tyler Nowicki 2014-07-16 00:40:42 +00:00
parent 0d830b4226
commit e470771b3a
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,8 @@ def remark_fe_backend_optimization_remark_missed : Remark<"%0">, BackendInfo,
InGroup<BackendOptimizationRemarkMissed>, DefaultRemark;
def remark_fe_backend_optimization_remark_analysis : Remark<"%0">, BackendInfo,
InGroup<BackendOptimizationRemarkAnalysis>, DefaultRemark;
def warn_fe_backend_optimization_warning : Warning<"%0">, BackendInfo,
InGroup<BackendOptimizationWarnings>, DefaultWarn;
def note_fe_backend_optimization_remark_invalid_loc : Note<"could "
"not determine the original source location for %0:%1:%2">;

1
clang/include/clang/Basic/DiagnosticGroups.td
View File

@ -704,6 +704,7 @@ def RemarkBackendPlugin : DiagGroup<"remark-backend-plugin">;
def BackendOptimizationRemark : DiagGroup<"pass">;
def BackendOptimizationRemarkMissed : DiagGroup<"pass-missed">;
def BackendOptimizationRemarkAnalysis : DiagGroup<"pass-analysis">;
def BackendOptimizationWarnings : DiagGroup<"optimization-warning">;
// Instrumentation based profiling warnings.
def ProfileInstrOutOfDate : DiagGroup<"profile-instr-out-of-date">;

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

@ -238,15 +238,16 @@ namespace clang {
/// \brief Specialized handlers for optimization remarks.
/// Note that these handlers only accept remarks and they always handle
/// them.
void
EmitOptimizationRemark(const llvm::DiagnosticInfoOptimizationRemarkBase &D,
unsigned DiagID);
void EmitOptimizationMessage(const llvm::DiagnosticInfoOptimizationBase &D,
unsigned DiagID);
void
OptimizationRemarkHandler(const llvm::DiagnosticInfoOptimizationRemark &D);
void OptimizationRemarkHandler(
const llvm::DiagnosticInfoOptimizationRemarkMissed &D);
void OptimizationRemarkHandler(
const llvm::DiagnosticInfoOptimizationRemarkAnalysis &D);
void OptimizationWarningHandler(
const llvm::DiagnosticInfoOptimizationWarning &D);
};
void BackendConsumer::anchor() {}
@ -416,10 +417,11 @@ BackendConsumer::StackSizeDiagHandler(const llvm::DiagnosticInfoStackSize &D) {
return false;
}
void BackendConsumer::EmitOptimizationRemark(
const llvm::DiagnosticInfoOptimizationRemarkBase &D, unsigned DiagID) {
// We only support remarks.
assert(D.getSeverity() == llvm::DS_Remark);
void BackendConsumer::EmitOptimizationMessage(
const llvm::DiagnosticInfoOptimizationBase &D, unsigned DiagID) {
// We only support warnings and remarks.
assert(D.getSeverity() == llvm::DS_Remark ||
D.getSeverity() == llvm::DS_Warning);
SourceManager &SourceMgr = Context->getSourceManager();
FileManager &FileMgr = SourceMgr.getFileManager();
@ -442,8 +444,12 @@ void BackendConsumer::EmitOptimizationRemark(
if (const Decl *FD = Gen->GetDeclForMangledName(D.getFunction().getName()))
Loc = FD->getASTContext().getFullLoc(FD->getBodyRBrace());
Diags.Report(Loc, DiagID) << AddFlagValue(D.getPassName())
<< D.getMsg().str();
// Flag value not used by all optimization messages.
if (D.getPassName())
Diags.Report(Loc, DiagID) << AddFlagValue(D.getPassName())
<< D.getMsg().str();
else
Diags.Report(Loc, DiagID) << D.getMsg().str();
if (DILoc.isInvalid())
// If we were not able to translate the file:line:col information
@ -460,7 +466,7 @@ void BackendConsumer::OptimizationRemarkHandler(
// expression that matches the name of the pass name in \p D.
if (CodeGenOpts.OptimizationRemarkPattern &&
CodeGenOpts.OptimizationRemarkPattern->match(D.getPassName()))
EmitOptimizationRemark(D, diag::remark_fe_backend_optimization_remark);
EmitOptimizationMessage(D, diag::remark_fe_backend_optimization_remark);
}
void BackendConsumer::OptimizationRemarkHandler(
@ -470,8 +476,8 @@ void BackendConsumer::OptimizationRemarkHandler(
// name in \p D.
if (CodeGenOpts.OptimizationRemarkMissedPattern &&
CodeGenOpts.OptimizationRemarkMissedPattern->match(D.getPassName()))
EmitOptimizationRemark(D,
diag::remark_fe_backend_optimization_remark_missed);
EmitOptimizationMessage(D,
diag::remark_fe_backend_optimization_remark_missed);
}
void BackendConsumer::OptimizationRemarkHandler(
@ -481,10 +487,15 @@ void BackendConsumer::OptimizationRemarkHandler(
// name in \p D.
if (CodeGenOpts.OptimizationRemarkAnalysisPattern &&
CodeGenOpts.OptimizationRemarkAnalysisPattern->match(D.getPassName()))
EmitOptimizationRemark(
EmitOptimizationMessage(
D, diag::remark_fe_backend_optimization_remark_analysis);
}
void BackendConsumer::OptimizationWarningHandler(
const llvm::DiagnosticInfoOptimizationWarning &D) {
EmitOptimizationMessage(D, diag::warn_fe_backend_optimization_warning);
}
/// \brief This function is invoked when the backend needs
/// to report something to the user.
void BackendConsumer::DiagnosticHandlerImpl(const DiagnosticInfo &DI) {
@ -518,6 +529,11 @@ void BackendConsumer::DiagnosticHandlerImpl(const DiagnosticInfo &DI) {
OptimizationRemarkHandler(
cast<DiagnosticInfoOptimizationRemarkAnalysis>(DI));
return;
case llvm::DK_OptimizationWarning:
// Optimization warnings are always handled completely by this
// handler.
OptimizationWarningHandler(cast<DiagnosticInfoOptimizationWarning>(DI));
return;
default:
// Plugin IDs are not bound to any value as they are set dynamically.
ComputeDiagRemarkID(Severity, backend_plugin, DiagID);