Skip to content

fix #37880, overflow in shift amount range check in codegen #37891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2020
Merged

fix #37880, overflow in shift amount range check in codegen #37891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 39 additions & 19 deletions src/intrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,25 +1183,45 @@ static Value *emit_untyped_intrinsic(jl_codectx_t &ctx, intrinsic f, Value **arg
case or_int: return ctx.builder.CreateOr(x, y);
case xor_int: return ctx.builder.CreateXor(x, y);

case shl_int:
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ConstantInt::get(t, 0),
ctx.builder.CreateShl(x, uint_cnvt(ctx, t, y)));
case lshr_int:
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ConstantInt::get(t, 0),
ctx.builder.CreateLShr(x, uint_cnvt(ctx, t, y)));
case ashr_int:
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ctx.builder.CreateAShr(x, ConstantInt::get(t, t->getPrimitiveSizeInBits() - 1)),
ctx.builder.CreateAShr(x, uint_cnvt(ctx, t, y)));

case shl_int: {
Value *the_shl = ctx.builder.CreateShl(x, uint_cnvt(ctx, t, y));
if (ConstantInt::isValueValidForType(y->getType(), t->getPrimitiveSizeInBits())) {
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ConstantInt::get(t, 0),
the_shl);
}
else {
return the_shl;
}
}
case lshr_int: {
Value *the_shr = ctx.builder.CreateLShr(x, uint_cnvt(ctx, t, y));
if (ConstantInt::isValueValidForType(y->getType(), t->getPrimitiveSizeInBits())) {
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ConstantInt::get(t, 0),
the_shr);
}
else {
return the_shr;
}
}
case ashr_int: {
Value *the_shr = ctx.builder.CreateAShr(x, uint_cnvt(ctx, t, y));
if (ConstantInt::isValueValidForType(y->getType(), t->getPrimitiveSizeInBits())) {
return ctx.builder.CreateSelect(
ctx.builder.CreateICmpUGE(y, ConstantInt::get(y->getType(),
t->getPrimitiveSizeInBits())),
ctx.builder.CreateAShr(x, ConstantInt::get(t, t->getPrimitiveSizeInBits() - 1)),
the_shr);
}
else {
return the_shr;
}
}
case bswap_int: {
FunctionCallee bswapintr = Intrinsic::getDeclaration(jl_Module, Intrinsic::bswap, makeArrayRef(t));
return ctx.builder.CreateCall(bswapintr, x);
Expand Down
16 changes: 16 additions & 0 deletions test/compiler/codegen.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,3 +479,19 @@ let d = Dict((:a,) => 1, (:a, :b) => 2)
@test d[(:a,)] == 1
@test d[(:a, :b)] == 2
end

# issue #37880
primitive type Has256Bits 256 end
let x = reinterpret(Has256Bits, [0xfcdac822cac89d82de4f9b3326da8294, 0x6ebac4d5982880ca703c57e37657f1ee])[]
shifted = [0xeefcdac822cac89d82de4f9b3326da82, 0x006ebac4d5982880ca703c57e37657f1]
f(x) = Base.lshr_int(x, 0x8)
@test reinterpret(UInt128, [f(x)]) == shifted
@test reinterpret(UInt128, [Base.lshr_int(x, 0x8)]) == shifted
g(x) = Base.ashr_int(x, 0x8)
@test reinterpret(UInt128, [g(x)]) == shifted
@test reinterpret(UInt128, [Base.ashr_int(x, 0x8)]) == shifted
lshifted = [0xdac822cac89d82de4f9b3326da829400, 0xbac4d5982880ca703c57e37657f1eefc]
h(x) = Base.shl_int(x, 0x8)
@test reinterpret(UInt128, [h(x)]) == lshifted
@test reinterpret(UInt128, [Base.shl_int(x, 0x8)]) == lshifted
end