summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2011-11-15 19:13:54 +0000
committerSean Callanan <scallanan@apple.com>2011-11-15 19:13:54 +0000
commitfe5d139b51c4d2715b4c5858daf74d81d7725fd8 (patch)
treeb3299f4f95224e10f6f4b7e292437bb2198ca6ce
parent7359122ba54b1d54034ae7e4bf214e86020d4b49 (diff)
downloadbcm5719-llvm-fe5d139b51c4d2715b4c5858daf74d81d7725fd8.tar.gz
bcm5719-llvm-fe5d139b51c4d2715b4c5858daf74d81d7725fd8.zip
Fixed a bug where the variable-resolution code
would occasionally try to resolve the placeholder variable used for static data allocation. llvm-svn: 144677
-rw-r--r--lldb/source/Expression/IRForTarget.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index fa4b0174694..c6d7f2dea2e 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -1499,6 +1499,9 @@ IRForTarget::MaterializeInternalVariable (GlobalVariable *global_variable)
if (GlobalVariable::isExternalLinkage(global_variable->getLinkage()))
return false;
+ if (global_variable == m_reloc_placeholder)
+ return true;
+
uint64_t offset = m_data_allocator->GetStream().GetSize();
llvm::Type *variable_type = global_variable->getType();
OpenPOWER on IntegriCloud