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

Bring r231132 back with a fix. 

The issue was that we were always printing the remarks. Fix that and add a test
showing that it prints nothing if -pass-remarks is not given.

Original message:
Correctly handle -pass-remarks in the gold plugin.

llvm-svn: 231273
This commit is contained in:
Rafael Espindola 2015-03-04 18:51:45 +00:00
parent 3027fedce4
commit f3f185486c
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/test/tools/gold/remarks.ll Normal file
View File

@ -0,0 +1,22 @@
; 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
; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
; RUN: %t.o -o %t2.o 2>&1 | FileCheck -allow-empty --check-prefix=NO-REMARK %s
; CHECK: f inlined into _start
; NO-REMARK-NOT: inlined
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,12 +296,9 @@ static void diagnosticHandler(const DiagnosticInfo &DI, void *Context) {
Level = LDPL_WARNING; Level = LDPL_WARNING;
break; break;
case DS_Note: case DS_Note:
case DS_Remark:
Level = LDPL_INFO; Level = LDPL_INFO;
break; 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()); message(Level, "LLVM gold plugin: %s", ErrStorage.c_str());
} }
@ -812,7 +809,7 @@ static ld_plugin_status allSymbolsReadHook(raw_fd_ostream *ApiFile) {
return LDPS_OK; return LDPS_OK;
LLVMContext Context; LLVMContext Context;
Context.setDiagnosticHandler(diagnosticHandler); Context.setDiagnosticHandler(diagnosticHandler, nullptr, true);
std::unique_ptr<Module> Combined(new Module("ld-temp.o", Context)); std::unique_ptr<Module> Combined(new Module("ld-temp.o", Context));
Linker L(Combined.get()); Linker L(Combined.get());