[llvm] r266872 - Revert "[gold-plugin] Disable name for values other than GlobalValue"

[Teresa Johnson via llvm-commits]

Author: tejohnson
Date: Wed Apr 20 08:18:47 2016
New Revision: 266872

URL: http://llvm.org/viewvc/llvm-project?rev=266872&view=rev
Log:
Revert "[gold-plugin] Disable name for values other than GlobalValue"

This reverts commit r266871. Setting the default based on the NDEBUG
flag is causing test failures. Need to figure out whether to change this
approach or update tests.

Removed:
    llvm/trunk/test/tools/gold/X86/strip_names.ll
Modified:
    llvm/trunk/tools/gold/gold-plugin.cpp

Removed: llvm/trunk/test/tools/gold/X86/strip_names.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/strip_names.ll?rev=266871&view=auto
==============================================================================
--- llvm/trunk/test/tools/gold/X86/strip_names.ll (original)
+++ llvm/trunk/test/tools/gold/X86/strip_names.ll (removed)
@@ -1,35 +0,0 @@
-; RUN: llvm-as %s -o %t.o
-
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
-; RUN:    --plugin-opt=emit-llvm \
-; RUN:    -shared %t.o -o %t2.o
-; RUN: llvm-dis %t2.o -o - | FileCheck %s
-
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
-; RUN:    --plugin-opt=emit-llvm \
-; RUN:    --plugin-opt=discard-value-names \
-; RUN:    -shared %t.o -o %t2.o
-; RUN: llvm-dis %t2.o -o - | FileCheck ---check-prefix=NONAME %s
-
-; CHECK: @GlobalValueName
-; CHECK: @foo(i32 %in)
-; CHECK: somelabel:
-; CHECK:  %GV = load i32, i32* @GlobalValueName
-; CHECK:  %add = add i32 %in, %GV
-; CHECK:  ret i32 %add
-
-; NONAME: @GlobalValueName
-; NONAME: @foo(i32)
-; NONAME-NOT: somelabel:
-; NONAME:  %2 = load i32, i32* @GlobalValueName
-; NONAME:  %3 = add i32 %0, %2
-; NONAME:  ret i32 %3
-
- at GlobalValueName = global i32 0
-
-define i32 @foo(i32 %in) {
-somelabel:
-  %GV = load i32, i32* @GlobalValueName
-  %add = add i32 %in, %GV
-  ret i32 %add
-}

Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=266872&r1=266871&r2=266872&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Wed Apr 20 08:18:47 2016
@@ -167,10 +167,8 @@ namespace options {
   static unsigned Parallelism = 0;
 #ifdef NDEBUG
   static bool DisableVerify = true;
-  static bool DiscardValueNames = true;
 #else
   static bool DisableVerify = false;
-  static bool DiscardValueNames = false;
 #endif
   static std::string obj_path;
   static std::string extra_library_path;
@@ -227,8 +225,6 @@ namespace options {
         message(LDPL_FATAL, "Invalid parallelism level: %s", opt_ + 5);
     } else if (opt == "disable-verify") {
       DisableVerify = true;
-    } else if (opt == "discard-value-names") {
-      DiscardValueNames = true;
     } else {
       // Save this option to pass to the code generator.
       // ParseCommandLineOptions() expects argv[0] to be program name. Lazily
@@ -1118,7 +1114,6 @@ static void thinLTOBackendTask(claimed_f
                                raw_fd_ostream *OS, unsigned TaskID) {
   // Need to use a separate context for each task
   LLVMContext Context;
-  Context.setDiscardValueNames(options::DiscardValueNames);
   Context.enableDebugTypeODRUniquing(); // Merge debug info types.
   Context.setDiagnosticHandler(diagnosticHandlerForContext, nullptr, true);
 
@@ -1241,7 +1236,6 @@ static ld_plugin_status allSymbolsReadHo
   }
 
   LLVMContext Context;
-  Context.setDiscardValueNames(options::DiscardValueNames);
   Context.enableDebugTypeODRUniquing(); // Merge debug info types.
   Context.setDiagnosticHandler(diagnosticHandlerForContext, nullptr, true);