D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-13 19:33:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #478 from klickverbot/symoffexp-toconstelem

Browse Source 
Fix SymOffExp::toConstElem.
This commit is contained in:
David Nadlinger
2013-09-25 03:51:50 -07:00
parent 20cc082413 f35176efad
commit 75f990aa08
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gen/toir.cpp
View File

@@ -1262,7 +1262,7 @@ DValue* SymOffExp::toElem(IRState* p)
llvm::Constant* SymOffExp::toConstElem(IRState* p)
{
Logger::print("SymOffExp::toConstElem: %s @ %s\n", toChars(), type->toChars());
IF_LOG Logger::println("SymOffExp::toConstElem: %s @ %s", toChars(), type->toChars());
LOG_SCOPE;
// We might get null here due to the hackish implementation of
@@ -1277,8 +1277,11 @@ llvm::Constant* SymOffExp::toConstElem(IRState* p)
}
else
{
uint64_t elemSize = gDataLayout->getTypeStoreSize(
const unsigned elemSize = gDataLayout->getTypeStoreSize(
base->getType()->getContainedType(0));
Logger::println("adding offset: %u (elem size: %u)", offset, elemSize);
if (offset % elemSize == 0)
{
// We can turn this into a "nice" GEP.
@@ -1291,7 +1294,7 @@ llvm::Constant* SymOffExp::toConstElem(IRState* p)
// apply the byte offset.
result = llvm::ConstantExpr::getGetElementPtr(
DtoBitCast(base, getVoidPtrType()),
DtoConstSize_t(offset / elemSize));
DtoConstSize_t(offset));
}
}