commit adda78f29ab74cffbbf3c4ec41a3d931a0d97dc7
author Pavel Labath <pavel@labath.sk> Thu Apr 18 06:45:50 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Apr 18 00:37:45 2024 -0700
tree f519f49adaf9edaab9cdbcf41495acbbb66796c3
parent 8476482889fa0be5e027844e4dfadbb267e8d88d

Revert "[lldb] Fix evaluation of expressions with static initializers (#89063)"

It breaks expression evaluation on arm, and the x86 breakage has been
fixed in 6cea7c491f4c4c68aa0494a9b18f36ff40c22c81.

This reverts commit 915c84b1480bb3c6d2e44ca83822d2c2304b763a.

GitOrigin-RevId: 3c721b90d363bf73b78467f6e86c879235bac1b2

source/Expression/IRExecutionUnit.cpp

diff --git a/source/Expression/IRExecutionUnit.cpp b/source/Expression/IRExecutionUnit.cpp
index 7ad0e5f..cb9bee8 100644
--- a/source/Expression/IRExecutionUnit.cpp
+++ b/source/Expression/IRExecutionUnit.cpp
@@ -13,7 +13,6 @@
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
-#include "llvm/Support/CodeGen.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -280,13 +279,10 @@
   llvm::EngineBuilder builder(std::move(m_module_up));
   llvm::Triple triple(m_module->getTargetTriple());
 
-  // PIC needed for ELF to avoid generating 32-bit relocations (which overflow
-  // if the object is loaded into high memory).
-  bool want_pic = triple.isOSBinFormatMachO() || triple.isOSBinFormatELF();
-
   builder.setEngineKind(llvm::EngineKind::JIT)
       .setErrorStr(&error_string)
-      .setRelocationModel(want_pic ? llvm::Reloc::PIC_ : llvm::Reloc::Static)
+      .setRelocationModel(triple.isOSBinFormatMachO() ? llvm::Reloc::PIC_
+                                                      : llvm::Reloc::Static)
       .setMCJITMemoryManager(std::make_unique<MemoryManager>(*this))
       .setOptLevel(llvm::CodeGenOptLevel::Less);