[llvm-commits] CVS: llvm/tools/lto/lto.cpp

[Bill Wendling]

Changes in directory llvm/tools/lto:

lto.cpp updated: 1.35 -> 1.36
---
Log message:

Avoid assert() in lto. Let linker handle all failures. Use LTO_WRITE_FAILURE
instead of LTO_UNKNOWN.


---
Diffs of the changes:  (+4 -9)

 lto.cpp |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)


Index: llvm/tools/lto/lto.cpp
diff -u llvm/tools/lto/lto.cpp:1.35 llvm/tools/lto/lto.cpp:1.36
--- llvm/tools/lto/lto.cpp:1.35	Wed Feb  7 19:41:07 2007
+++ llvm/tools/lto/lto.cpp	Wed Feb  7 19:48:28 2007
@@ -313,13 +313,10 @@
   MachineCodeEmitter *MCE = 0;
 
   switch (Target->addPassesToEmitFile(*CodeGenPasses, Out,
-                                     TargetMachine::AssemblyFile, true)) {
+                                      TargetMachine::AssemblyFile, true)) {
   default:
-    assert(0 && "Invalid file model!");
-    return LTO_UNKNOWN;
   case FileModel::Error:
-    // FIXME: Error...
-    return LTO_UNKNOWN;
+    return LTO_WRITE_FAILURE;
   case FileModel::AsmFile:
     break;
   case FileModel::MachOFile:
@@ -330,10 +327,8 @@
     break;
   }
 
-  if (Target->addPassesToEmitFileFinish(*CodeGenPasses, MCE, true)) {
-    // FIXME: Error...
-    return LTO_UNKNOWN;
-  }
+  if (Target->addPassesToEmitFileFinish(*CodeGenPasses, MCE, true))
+    return LTO_WRITE_FAILURE;
 
   // Run our queue of passes all at once now, efficiently.
   Passes.run(*M);