[llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/JIT.cpp

[Chris Lattner]

Changes in directory llvm/lib/ExecutionEngine/JIT:

JIT.cpp updated: 1.67 -> 1.68
---
Log message:

Adapt to new interface function materialization interface


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

 JIT.cpp |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)


Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.67 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.68
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.67	Thu Jun  1 12:29:22 2006
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Fri Jul  7 12:18:09 2006
@@ -256,18 +256,14 @@
     return Addr;   // Check if function already code gen'd
 
   // Make sure we read in the function if it exists in this Module
-  if (F->hasNotBeenReadFromBytecode())
-    try {
-      MP->materializeFunction(F);
-    } catch ( std::string& errmsg ) {
+  if (F->hasNotBeenReadFromBytecode()) {
+    std::string ErrorMsg;
+    if (MP->materializeFunction(F, &ErrorMsg)) {
       std::cerr << "Error reading function '" << F->getName()
-                << "' from bytecode file: " << errmsg << "\n";
-      abort();
-    } catch (...) {
-      std::cerr << "Error reading function '" << F->getName()
-                << "from bytecode file!\n";
+                << "' from bytecode file: " << ErrorMsg << "\n";
       abort();
     }
+  }
 
   if (F->isExternal()) {
     void *Addr = getPointerToNamedFunction(F->getName());