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

[Reid Spencer]

Changes in directory llvm/tools/llvm-ld:

llvm-ld.cpp updated: 1.36 -> 1.37
---
Log message:

For PR797: http://llvm.org/PR797 :
Eliminate exception throwing from Path::renamePathOnDisk and adjust its 
users correspondingly.


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

 llvm-ld.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/tools/llvm-ld/llvm-ld.cpp
diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.36 llvm/tools/llvm-ld/llvm-ld.cpp:1.37
--- llvm/tools/llvm-ld/llvm-ld.cpp:1.36	Tue Aug 22 19:39:35 2006
+++ llvm/tools/llvm-ld/llvm-ld.cpp	Wed Aug 23 02:30:48 2006
@@ -505,7 +505,10 @@
             if (tmp_output.isBytecodeFile()) {
               sys::Path target(RealBytecodeOutput);
               target.eraseFromDisk();
-              tmp_output.renamePathOnDisk(target);
+              if (tmp_output.renamePathOnDisk(target, &ErrMsg)) {
+                std::cerr << argv[0] << ": " << ErrMsg << "\n";
+                return 2;
+              }
             } else
               return PrintAndReturn(
                 "Post-link optimization output is not bytecode");