From 84a9697c1799af0c0d9f8d23a03f4e2d3fe5ed18 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 4 Mar 2015 16:24:28 +0000 Subject: [PATCH] Revert r231132, "Correctly handle -pass-remarks in the gold plugin.", for now, to suppress log floodng in LTO. llvm-svn: 231253 --- llvm/test/tools/gold/remarks.ll | 17 ----------------- llvm/tools/gold/gold-plugin.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 llvm/test/tools/gold/remarks.ll diff --git a/llvm/test/tools/gold/remarks.ll b/llvm/test/tools/gold/remarks.ll deleted file mode 100644 index 458f977..0000000 --- a/llvm/test/tools/gold/remarks.ll +++ /dev/null @@ -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 -} diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp index 9fcc83b..2aec4e2 100644 --- a/llvm/tools/gold/gold-plugin.cpp +++ b/llvm/tools/gold/gold-plugin.cpp @@ -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 Combined(new Module("ld-temp.o", Context)); Linker L(Combined.get()); -- 2.7.4