commit df3fee4cc5190480970200f0162b00b841f22011
author Zonr Chang <zonr.net@gmail.com> Tue Jan 10 15:58:36 2012 +0800
committer Shih-wei Liao <sliao@google.com> Tue Jan 17 01:45:52 2012 -0800
tree e8e7a343288b17ed5b235ee42fc075810df79677
parent 8afed380cda0bc4b3d325064fc44b181312651ad

Let SourceInfo take charage of and LLVM module.

I.e., a module never escapes from its associated SourceInfo object.

Change-Id: Ib7fe914052e8b1b06b879737f57828739d54e0f0

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index 2751299..9e59495 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -76,9 +76,8 @@
     break;
   }
 
-  for (size_t i = 0; i < 2; ++i) {
+  for (size_t i = 0; i < 2; ++i)
     delete mSourceList[i];
-  }
 }
 
 
@@ -346,28 +345,25 @@
                                       mpExtSymbolLookupFnContext);
   }
 
-  // Parse Bitcode File (if necessary)
-  for (size_t i = 0; i < 2; ++i) {
-    if (mSourceList[i] && mSourceList[i]->prepareModule(mCompiled) != 0) {
-      ALOGE("Unable to parse bitcode for source[%lu]\n", (unsigned long)i);
-      return 1;
-    }
-  }
-
-  // Set the main source module
-  if (!mSourceList[0] || !mSourceList[0]->getModule()) {
-    ALOGE("Source bitcode is not setted.\n");
+  if (!mSourceList[0]) {
+    ALOGE("Source bitcode is not set.\n");
     return 1;
   }
 
-  if (mCompiled->readModule(mSourceList[0]->takeModule()) != 0) {
+  // Parse Bitcode File (if necessary)
+  if (mSourceList[0]->prepareModule() != 0)
+    return 1;
+
+  // Set the main source module
+  if (mCompiled->readModule(mSourceList[0]->getModule()) != 0) {
     ALOGE("Unable to read source module\n");
     return 1;
   }
 
   // Link the source module with the library module
-  if (mSourceList[1]) {
-    if (mCompiled->linkModule(mSourceList[1]->takeModule()) != 0) {
+  if (mSourceList[1] &&
+      mSourceList[1]->prepareModule(mSourceList[0]->getContext())) {
+    if (mCompiled->linkModule(mSourceList[1]->getModule()) != 0) {
       ALOGE("Unable to link library module\n");
       return 1;
     }