[Lldb-commits] [lldb] r118114 - /lldb/trunk/source/Expression/ClangExpressionParser.cpp

[Sean Callanan]

Author: spyffe
Date: Tue Nov  2 18:20:00 2010
New Revision: 118114

URL: http://llvm.org/viewvc/llvm-project?rev=118114&view=rev
Log:
Fixed a bug that was confusing the code generator
on i386 platforms, leading to crashes on simple
expressions.

Modified:
    lldb/trunk/source/Expression/ClangExpressionParser.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=118114&r1=118113&r2=118114&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Tue Nov  2 18:20:00 2010
@@ -471,9 +471,7 @@
     m_jit_mm = new RecordingMemoryManager();
     
     std::string error_string;
-    
-    llvm::Reloc::Model relocation_model = llvm::TargetMachine::getRelocationModel();
-    
+        
     llvm::TargetMachine::setRelocationModel(llvm::Reloc::PIC_);
     
     m_execution_engine.reset(llvm::ExecutionEngine::createJIT (module, 
@@ -482,9 +480,7 @@
                                                                CodeGenOpt::Less,
                                                                true,
                                                                CodeModel::Small));
-    
-    llvm::TargetMachine::setRelocationModel(relocation_model);
-    
+        
     if (!m_execution_engine.get())
     {
         err.SetErrorToGenericError();