mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-02 16:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix evaluation order of bitwise operators

Browse source
This commit is contained in:
Johan Engelen 2016-07-12 22:59:58 +02:00
parent cec61a4432
commit cb15d21996
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gen/toir.cpp
View file

@ -2136,12 +2136,13 @@ public:
IF_LOG Logger::print("%sExp::toElem: %s @ %s\n", #X, e->toChars(), \
e->type->toChars()); \
LOG_SCOPE; \
DValue *u = toElem(e->e1); \
DValue *v = toElem(e->e2); \
errorOnIllegalArrayOp(e, e->e1, e->e2); \
auto lhs = DtoRVal(toElem(e->e1)); \
DValue *v = toElem(e->e2); \
v = DtoCast(e->loc, v, e->e1->type); \
LLValue *x = llvm::BinaryOperator::Create( \
llvm::Instruction::Y, DtoRVal(u), DtoRVal(v), "", p->scopebb()); \
auto rhs = DtoRVal(v); \
LLValue *x = llvm::BinaryOperator::Create(llvm::Instruction::Y, lhs, rhs, \
"", p->scopebb()); \
result = new DImValue(e->type, x); \
}
@ -2156,14 +2157,17 @@ public:
IF_LOG Logger::print("ShrExp::toElem: %s @ %s\n", e->toChars(),
e->type->toChars());
LOG_SCOPE;
DValue *u = toElem(e->e1);
auto lhs = DtoRVal(toElem(e->e1));
DValue *v = toElem(e->e2);
v = DtoCast(e->loc, v, e->e1->type);
auto rhs = DtoRVal(v);
LLValue *x;
if (isLLVMUnsigned(e->e1->type)) {
x = p->ir->CreateLShr(DtoRVal(u), DtoRVal(v));
x = p->ir->CreateLShr(lhs, rhs);
} else {
x = p->ir->CreateAShr(DtoRVal(u), DtoRVal(v));
x = p->ir->CreateAShr(lhs, rhs);
}
result = new DImValue(e->type, x);
}