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

Revert r231132, "Correctly handle -pass-remarks in the gold plugin.", for now, to suppress log floodng in LTO. 

llvm-svn: 231253
This commit is contained in:
NAKAMURA Takumi 2015-03-04 16:24:28 +00:00
parent 66599d8ea8
commit 84a9697c17
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/test/tools/gold/remarks.ll
View File

@ -1,17 +0,0 @@
; RUN: llvm-as %s -o %t.o
; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
; RUN: -plugin-opt=-pass-remarks=inline %t.o -o %t2.o 2>&1 | FileCheck %s
; CHECK: f inlined into _start
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @f() {
ret i32 0
}
define i32 @_start() {
%call = call i32 @f()
ret i32 %call
}

7
llvm/tools/gold/gold-plugin.cpp
View File

@ -296,9 +296,12 @@ static void diagnosticHandler(const DiagnosticInfo &DI, void *Context) {
Level = LDPL_WARNING;
break;
case DS_Note:
case DS_Remark:
Level = LDPL_INFO;
break;
// FIXME: Just ignore remarks for now. They are always passed by
// if there is a custom diagnostic handler, so we get flooded.
case DS_Remark:
return;
}
message(Level, "LLVM gold plugin: %s", ErrStorage.c_str());
}
@ -809,7 +812,7 @@ static ld_plugin_status allSymbolsReadHook(raw_fd_ostream *ApiFile) {
return LDPS_OK;
LLVMContext Context;
Context.setDiagnosticHandler(diagnosticHandler, nullptr, false);
Context.setDiagnosticHandler(diagnosticHandler);
std::unique_ptr<Module> Combined(new Module("ld-temp.o", Context));
Linker L(Combined.get());