commit 1e7089a2137403401a219a34c8a8d43c529abda0
author Sean Callanan <scallanan@apple.com> Thu Jul 29 19:03:08 2010 +0000
committer Sean Callanan <scallanan@apple.com> Thu Jul 29 19:03:08 2010 +0000
tree 8130c3faf42135487a849d5e84b28cd44349d3ee
parent 61bfb3e00fc2972141dca32f2a663184dfaef14f

Fixed the expression code to use the right
code model with the JIT.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@109792 91177308-0d34-0410-b5e6-96231b3b80d8

source/Expression/ClangExpression.cpp

diff --git a/source/Expression/ClangExpression.cpp b/source/Expression/ClangExpression.cpp
index d338a09..c7d58b7 100644
--- a/source/Expression/ClangExpression.cpp
+++ b/source/Expression/ClangExpression.cpp
@@ -194,6 +194,8 @@
         m_target_triple = target_triple;
     else
         m_target_triple = llvm::sys::getHostTriple();
+    
+    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS);
 }
 
 
@@ -539,17 +541,6 @@
             m_jit_mm_ptr = new RecordingMemoryManager();
 
         //llvm::InitializeNativeTarget();
-                        
-        if (m_execution_engine.get() == 0)
-            m_execution_engine.reset(llvm::ExecutionEngine::createJIT (module, 
-                                                                       &error, 
-                                                                       m_jit_mm_ptr,
-                                                                       CodeGenOpt::Default,
-                                                                       true,
-                                                                       CodeModel::Default));
-        
-        m_execution_engine->DisableLazyCompilation();
-        llvm::Function *function = module->getFunction (llvm::StringRef (name));
         
         if (log)
         {
@@ -557,22 +548,33 @@
             
             switch (llvm::TargetMachine::getRelocationModel())
             {
-            case llvm::Reloc::Default:
-                relocation_model_string = "Default";
-                break;
-            case llvm::Reloc::Static:
-                relocation_model_string = "Static";
-                break;
-            case llvm::Reloc::PIC_:
-                relocation_model_string = "PIC_++";
-                break;
-            case llvm::Reloc::DynamicNoPIC:
-                relocation_model_string = "DynamicNoPIC";
-                break;
+                case llvm::Reloc::Default:
+                    relocation_model_string = "Default";
+                    break;
+                case llvm::Reloc::Static:
+                    relocation_model_string = "Static";
+                    break;
+                case llvm::Reloc::PIC_:
+                    relocation_model_string = "PIC_";
+                    break;
+                case llvm::Reloc::DynamicNoPIC:
+                    relocation_model_string = "DynamicNoPIC";
+                    break;
             }
             
             log->Printf("Target machine's relocation model: %s", relocation_model_string);
         }
+                        
+        if (m_execution_engine.get() == 0)
+            m_execution_engine.reset(llvm::ExecutionEngine::createJIT (module, 
+                                                                       &error, 
+                                                                       m_jit_mm_ptr,
+                                                                       CodeGenOpt::Default,
+                                                                       true,
+                                                                       CodeModel::Small)); // set to small so RIP-relative relocations work in PIC
+        
+        m_execution_engine->DisableLazyCompilation();
+        llvm::Function *function = module->getFunction (llvm::StringRef (name));
             
         // We don't actually need the function pointer here, this just forces it to get resolved.
         void *fun_ptr = m_execution_engine->getPointerToFunction(function);