M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 99 Pull Requests 20 Releases Wiki Activity

Error Message Include File Name (#70) and Minor Fix #154

Closed
ychenfo wants to merge 19 commits from ast_filename_location into master
pull from: ast_filename_location
merge into: M-Labs:master
Conversation 0 Commits 19 Files Changed 59 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84a7e588ca - Show all commits

6
nac3artiq/src/symbol_resolver.rs
View File

@ -596,7 +596,7 @@ impl InnerResolver {
)?
.unwrap()
};
let ty = ctx.get_llvm_type(ty);
let ty = ctx.get_llvm_type(generator, ty);
let size_t = generator.get_size_type(ctx.ctx);
let arr_ty = ctx.ctx.struct_type(
&[ty.ptr_type(AddressSpace::Generic).into(), size_t.into()],
@ -696,7 +696,7 @@ impl InnerResolver {
&ctx.top_level.definitions.read(),
&ctx.primitives,
)
.map(|ty| ty.map(|ty| ctx.get_llvm_type(ty)))
.map(|ty| ty.map(|ty| ctx.get_llvm_type(generator, ty)))
})
.collect();
let types = types?.unwrap();
@ -737,7 +737,7 @@ impl InnerResolver {
.get_obj_type(py, obj, &mut ctx.unifier, &top_level_defs, &ctx.primitives)?
.unwrap();
let ty = ctx
.get_llvm_type(ty)
.get_llvm_type(generator, ty)
.into_pointer_type()
.get_element_type()
.into_struct_type()