[llvm] r245959 - [dsymutil] Not finding any debug info is not a fatal error

[Frederic Riss via llvm-commits]

Author: friss
Date: Tue Aug 25 13:19:43 2015
New Revision: 245959

URL: http://llvm.org/viewvc/llvm-project?rev=245959&view=rev
Log:
[dsymutil] Not finding any debug info is not a fatal error

Added:
    llvm/trunk/test/tools/dsymutil/ARM/empty-map.test
Modified:
    llvm/trunk/tools/dsymutil/DwarfLinker.cpp
    llvm/trunk/tools/dsymutil/dsymutil.cpp

Added: llvm/trunk/test/tools/dsymutil/ARM/empty-map.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/ARM/empty-map.test?rev=245959&view=auto
==============================================================================
--- llvm/trunk/test/tools/dsymutil/ARM/empty-map.test (added)
+++ llvm/trunk/test/tools/dsymutil/ARM/empty-map.test Tue Aug 25 13:19:43 2015
@@ -0,0 +1,8 @@
+# REQUIRES: object-emission
+# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
+
+---
+triple:          'thumbv7-apple-darwin'
+...
+
+# CHECK: warning: no debug symbols in executable (-arch thumbv7)

Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=245959&r1=245958&r2=245959&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Tue Aug 25 13:19:43 2015
@@ -3034,11 +3034,6 @@ DwarfLinker::loadObject(BinaryHolder &Bi
 
 bool DwarfLinker::link(const DebugMap &Map) {
 
-  if (Map.begin() == Map.end()) {
-    errs() << "Empty debug map.\n";
-    return false;
-  }
-
   if (!createStreamer(Map.getTriple(), OutputFilename))
     return false;
 

Modified: llvm/trunk/tools/dsymutil/dsymutil.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/dsymutil.cpp?rev=245959&r1=245958&r2=245959&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/dsymutil.cpp (original)
+++ llvm/trunk/tools/dsymutil/dsymutil.cpp Tue Aug 25 13:19:43 2015
@@ -299,6 +299,10 @@ int main(int argc, char **argv) {
       if (DumpDebugMap)
         continue;
 
+      if (Map->begin() == Map->end())
+        llvm::errs() << "warning: no debug symbols in executable (-arch "
+                     << Map->getTriple().getArchName() << ")\n";
+
       std::string OutputFile = getOutputFileName(InputFile, NeedsTempFiles);
       if (OutputFile.empty() || !linkDwarf(OutputFile, *Map, Options))
         exitDsymutil(1);