Skip to content

codegen: on alignment incongruence, replace assert by jl_error #34245

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

Closed
wants to merge 2 commits into from
Closed

codegen: on alignment incongruence, replace assert by jl_error #34245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd7c96
codegen: on alignment incongruence, replace assert by jl_error
tkluck Jan 3, 2020
68bd03c
Add test for #34245
tkluck Jan 4, 2020
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
37 changes: 32 additions & 5 deletions src/cgutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,10 @@ static unsigned convert_struct_offset(Type *lty, unsigned byte_offset)
const DataLayout &DL = jl_data_layout;
const StructLayout *SL = DL.getStructLayout(cast<StructType>(lty));
unsigned idx = SL->getElementContainingOffset(byte_offset);
assert(SL->getElementOffset(idx) == byte_offset);
if(SL->getElementOffset(idx) != byte_offset) {
// sentinel error value
return (unsigned)(-1);
}
return idx;
}

Expand Down Expand Up @@ -1692,9 +1695,15 @@ static jl_cgval_t emit_getfield_knownidx(jl_codectx_t &ctx, const jl_cgval_t &st
else if (!jl_field_isptr(jt, idx) && jl_is_uniontype(jfty)) {
int fsz = jl_field_size(jt, idx) - 1;
unsigned ptindex = convert_struct_offset(ctx, T, byte_offset + fsz);
if(ptindex == (unsigned)(-1)) {
jl_errorf("Cannot generate accessor code because of incompatible alignment requirements");
}
AllocaInst *lv = NULL;
if (fsz > 0) {
unsigned st_idx = convert_struct_offset(ctx, T, byte_offset);
if(ptindex == (unsigned)(-1)) {
jl_errorf("Cannot generate accessor code because of incompatible alignment requirements");
}
IntegerType *ET = cast<IntegerType>(T->getStructElementType(st_idx));
unsigned align = (ET->getBitWidth() + 7) / 8;
lv = emit_static_alloca(ctx, ET);
Expand Down Expand Up @@ -1724,12 +1733,16 @@ static jl_cgval_t emit_getfield_knownidx(jl_codectx_t &ctx, const jl_cgval_t &st
}
else {
unsigned st_idx;
if (isa<ArrayType>(T))
if (isa<ArrayType>(T)) {
st_idx = idx;
else if (isa<StructType>(T))
} else if (isa<StructType>(T)) {
st_idx = convert_struct_offset(ctx, T, byte_offset);
else
if(st_idx == (unsigned)(-1)) {
jl_errorf("Cannot generate accessor code because of incompatible alignment requirements");
}
} else {
llvm_unreachable("encountered incompatible type for a struct");
}
fldv = ctx.builder.CreateExtractValue(obj, makeArrayRef(st_idx));
}
if (maybe_null && jl_field_isptr(jt, idx))
Expand Down Expand Up @@ -2107,8 +2120,12 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt)
return NULL; // TODO: handle this?
}
unsigned llvm_idx = i;
if (i > 0 && isa<StructType>(constant->getType()))
if (i > 0 && isa<StructType>(constant->getType())) {
llvm_idx = convert_struct_offset(constant->getType(), jl_field_offset(jst, i));
if(llvm_idx == (unsigned)(-1)) {
jl_errorf("Cannot create an static instance of %s because of incompatible alignment requirements", jl_symbol_name(jst->name->name));
}
}
Constant *fld = constant->getAggregateElement(llvm_idx);
flds[i] = static_constant_instance(fld, ft);
if (flds[i] == NULL) {
Expand Down Expand Up @@ -2617,6 +2634,10 @@ static jl_cgval_t emit_new_struct(jl_codectx_t &ctx, jl_value_t *ty, size_t narg
Value *dest = NULL;
unsigned offs = jl_field_offset(sty, i);
unsigned llvm_idx = (i > 0 && isa<StructType>(lt)) ? convert_struct_offset(ctx, lt, offs) : i;
if(llvm_idx == (unsigned)(-1)) {
jl_errorf("Cannot create an instance of %s because of incompatible alignment requirements", jl_symbol_name(sty->name->name));
}

if (!init_as_value) {
// avoid unboxing the argument explicitly
// and use memcpy instead
Expand All @@ -2640,6 +2661,9 @@ static jl_cgval_t emit_new_struct(jl_codectx_t &ctx, jl_value_t *ty, size_t narg
// then load it and combine with the tindex.
// But more efficient to just store it directly.
unsigned ptindex = convert_struct_offset(ctx, lt, offs + fsz);
if(ptindex == (unsigned)(-1)) {
jl_errorf("Cannot create an instance of %s because of incompatible alignment requirements", jl_symbol_name(sty->name->name));
}
if (fsz > 0 && !fval_info.isghost) {
Type *ET = IntegerType::get(jl_LLVMContext, 8 * al);
assert(lt->getStructElementType(llvm_idx) == ET);
Expand Down Expand Up @@ -2694,6 +2718,9 @@ static jl_cgval_t emit_new_struct(jl_codectx_t &ctx, jl_value_t *ty, size_t narg
unsigned offs = jl_field_offset(sty, i);
int fsz = jl_field_size(sty, i) - 1;
unsigned llvm_idx = convert_struct_offset(ctx, cast<StructType>(lt), offs + fsz);
if(llvm_idx == (unsigned)(-1)) {
jl_errorf("Cannot create an instance of %s because of incompatible alignment requirements", jl_symbol_name(sty->name->name));
}
if (init_as_value)
strct = ctx.builder.CreateInsertValue(strct, ConstantInt::get(T_int8, 0), makeArrayRef(llvm_idx));
else
Expand Down
8 changes: 8 additions & 0 deletions test/vecelement.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,11 @@ for T in (Float64, Float32, Int64, Int32)
@test b == result
end
end

# Eventually, this should not raise an error at all; we're just testing that at least it doesn't abort.
# see #34245 for details.
let
foo() = ntuple(i -> Core.VecElement{Float64}(i), Val(8));
bar(a) = (a, foo())
@test_throws ErrorException bar(42.0)
end