Changes in directory llvm/lib/ExecutionEngine/Interpreter:
Interpreter.cpp updated: 1.36 -> 1.37
Interpreter.h updated: 1.84 -> 1.85
---
Log message:
Deal with error handling better.
---
Diffs of the changes: (+16 -8)
Interpreter.cpp | 22 +++++++++++++++-------
Interpreter.h | 2 +-
2 files changed, 16 insertions(+), 8 deletions(-)
Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp:1.36
llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp:1.37
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp:1.36 Mon Jan 29
11:55:50 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp Sat Mar 3
12:19:18 2007
@@ -18,6 +18,7 @@
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
+#include <iostream>
using namespace llvm;
static struct RegisterInterp {
@@ -31,13 +32,20 @@
/// create - Create a new interpreter object. This can never fail.
///
-ExecutionEngine *Interpreter::create(ModuleProvider *MP) {
- Module *M;
- try {
- M = MP->materializeModule();
- } catch (...) {
- return 0; // error materializing the module.
- }
+ExecutionEngine *Interpreter::create(ModuleProvider *MP, std::string* ErrStr) {
+ // Tell this ModuleProvide to materialize and release the module
+ Module *M = MP->releaseModule(ErrStr);
+ if (!M)
+ // We got an error, just return 0
+ return 0;
+
+ // This is a bit nasty, but the ExecutionEngine won't be able to delete the
+ // module due to use/def issues if we don't delete this MP here. Below we
+ // construct a new Interpreter with the Module we just got. This creates a
+ // new ExistingModuleProvider in the EE instance. Consequently, MP is left
+ // dangling and it contains references into the module which cause problems
+ // when the module is deleted via the ExistingModuleProvide via EE.
+ delete MP;
// FIXME: This should probably compute the entire data layout
std::string DataLayout;
Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.84
llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.85
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.84 Sat Mar 3
00:19:55 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h Sat Mar 3 12:19:18 2007
@@ -120,7 +120,7 @@
/// create - Create an interpreter ExecutionEngine. This can never fail.
///
- static ExecutionEngine *create(ModuleProvider *M);
+ static ExecutionEngine *create(ModuleProvider *M, std::string *ErrorStr = 0);
/// run - Start execution with the specified function and arguments.
///
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
