[lld] r253374 - Fixing build failures caused by r253367. Sorry for breaking the build.

Yunzhong Gao via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 17 12:48:12 PST 2015


Author: ygao
Date: Tue Nov 17 14:48:12 2015
New Revision: 253374

URL: http://llvm.org/viewvc/llvm-project?rev=253374&view=rev
Log:
Fixing build failures caused by r253367. Sorry for breaking the build.


Modified:
    lld/trunk/COFF/SymbolTable.cpp

Modified: lld/trunk/COFF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/SymbolTable.cpp?rev=253374&r1=253373&r2=253374&view=diff
==============================================================================
--- lld/trunk/COFF/SymbolTable.cpp (original)
+++ lld/trunk/COFF/SymbolTable.cpp Tue Nov 17 14:48:12 2015
@@ -412,9 +412,8 @@ std::vector<ObjectFile *> SymbolTable::c
 #ifdef NDEBUG
   DisableVerify = false;
 #endif
-  std::string ErrMsg;
-  if (!CG->optimize(DisableVerify, false, false, false, ErrMsg))
-    error(ErrMsg);
+  if (!CG->optimize(DisableVerify, false, false, false))
+    error(""); // optimize() should have emitted any error message.
 
   Objs.resize(Config->LTOJobs);
   // Use std::list to avoid invalidation of pointers in OSPtrs.
@@ -425,8 +424,8 @@ std::vector<ObjectFile *> SymbolTable::c
     OSPtrs.push_back(&OSs.back());
   }
 
-  if (!CG->compileOptimized(OSPtrs, ErrMsg))
-    error(ErrMsg);
+  if (!CG->compileOptimized(OSPtrs))
+    error(""); // compileOptimized() should have emitted any error message.
 
   std::vector<ObjectFile *> ObjFiles;
   for (SmallVector<char, 0> &Obj : Objs) {




More information about the llvm-commits mailing list