[llvm] r231273 - Bring r231132 back with a fix.

[Rafael Espindola]

Author: rafael
Date: Wed Mar  4 12:51:45 2015
New Revision: 231273

URL: http://llvm.org/viewvc/llvm-project?rev=231273&view=rev
Log:
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.

Added:
    llvm/trunk/test/tools/gold/remarks.ll
Modified:
    llvm/trunk/tools/gold/gold-plugin.cpp

Added: llvm/trunk/test/tools/gold/remarks.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/remarks.ll?rev=231273&view=auto
==============================================================================
--- llvm/trunk/test/tools/gold/remarks.ll (added)
+++ llvm/trunk/test/tools/gold/remarks.ll Wed Mar  4 12:51:45 2015
@@ -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
+}

Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=231273&r1=231272&r2=231273&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Wed Mar  4 12:51:45 2015
@@ -296,12 +296,9 @@ static void diagnosticHandler(const Diag
     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());
 }
@@ -812,7 +809,7 @@ static ld_plugin_status allSymbolsReadHo
     return LDPS_OK;
 
   LLVMContext Context;
-  Context.setDiagnosticHandler(diagnosticHandler);
+  Context.setDiagnosticHandler(diagnosticHandler, nullptr, true);
 
   std::unique_ptr<Module> Combined(new Module("ld-temp.o", Context));
   Linker L(Combined.get());