commit 70dd998ad9d75fddfa513a420e078bec2938d539
author Logan Chien <tzuhsiang.chien@gmail.com> Mon Jun 13 23:21:39 2011 +0800
committer Logan Chien <tzuhsiang.chien@gmail.com> Mon Jun 13 23:21:39 2011 +0800
tree f28c03a2c8a6e5c8f603571b1dc1c9238fd35c42
parent 2d37d30d205d907125d3560834c9cd13f5c4eee2

Fix bug: Use same algorithm to generate export var list.

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index b89c0ce..9fa6d4d 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -608,19 +608,22 @@
 
     for (int i = 0, e = ExportVarMetadata->getNumOperands(); i != e; i++) {
       llvm::MDNode *ExportVar = ExportVarMetadata->getOperand(i);
-      if (ExportVar == NULL || ExportVar->getNumOperands() <= 1) {
-        continue;
+      if (ExportVar != NULL && ExportVar->getNumOperands() > 1) {
+        llvm::Value *ExportVarNameMDS = ExportVar->getOperand(0);
+        if (ExportVarNameMDS->getValueID() == llvm::Value::MDStringVal) {
+          llvm::StringRef ExportVarName =
+            static_cast<llvm::MDString*>(ExportVarNameMDS)->getString();
+
+          varList.push_back(
+            rsloaderGetSymbolAddress(mRSExecutable,
+                                     ExportVarName.str().c_str()));
+          LOGD("MC/ Exported Var: %s @ %p\n", ExportVarName.str().c_str(),
+               varList.back());
+          continue;
+        }
       }
 
-      llvm::Value *ExportVarNameMDS = ExportVar->getOperand(0);
-      if (ExportVarNameMDS->getValueID() == llvm::Value::MDStringVal) {
-        llvm::StringRef ExportVarName =
-          static_cast<llvm::MDString*>(ExportVarNameMDS)->getString();
-
-        varList.push_back(
-          rsloaderGetSymbolAddress(mRSExecutable,
-                                   ExportVarName.str().c_str()));
-      }
+      varList.push_back(NULL);
     }
   }