Merge branch 'master' into merge-2.067

This commit is contained in:
Kai Nacke 2015-05-30 10:42:06 +02:00
commit 63ed72cf48
3 changed files with 2 additions and 7 deletions

View file

@ -474,11 +474,6 @@ void DtoAssign(Loc& loc, DValue* lhs, DValue* rhs, int op, bool canSkipPostblit)
}
gIR->ir->CreateStore(r, l);
}
DVarValue *var = lhs->isVar();
VarDeclaration *vd = var ? var->var : 0;
if (vd)
gIR->DBuilder.EmitValue(DtoLoad(var->getLVal()), vd);
}
/****************************************************************************************/

View file

@ -27,7 +27,7 @@
static bool isAligned(llvm::Type* type, size_t offset)
{
return gDataLayout->getABITypeAlignment(type) % offset == 0;
return (offset % gDataLayout->getABITypeAlignment(type)) == 0;
}
size_t add_zeros(std::vector<llvm::Type*>& defaultTypes,

@ -1 +1 @@
Subproject commit 4194e70f1fb2a172fdc8f43f10aa48106421bafb
Subproject commit 08d76ac641c539e24bd143778887146e7d6927d0