Skip to content
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

Tuples made me sad (so I fixed them) #4042

Merged
merged 28 commits into from
Dec 7, 2013
Merged

Tuples made me sad (so I fixed them) #4042

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9f2002c
Pass tuples unboxed if possible
Keno Aug 11, 2013
793562b
All tests pass
Keno Aug 12, 2013
9bfd041
Specialize more functions
Keno Aug 12, 2013
4917312
bugfixes
Keno Aug 13, 2013
2ffa794
Remove unnessecary pto argument from emit_unbox
Keno Aug 13, 2013
c802070
Adjust llvmcall for new tuple infrastructure
Keno Aug 13, 2013
91f8ae7
Some llvmcall bugfixes
Keno Aug 13, 2013
c343b5a
Address compiler warnings
Keno Aug 13, 2013
49217ff
Also remove PM initialization
Keno Aug 13, 2013
9cc2819
Handle nothingness correctly
Keno Aug 13, 2013
aec2612
Fix a performance regression
Keno Aug 14, 2013
6b567e1
tpl -> &tpl and don't use return value from unreachable
Keno Aug 15, 2013
1933ea7
Allow unboxed storing tupl purebits tuples
Keno Aug 15, 2013
c58e1ff
remove invalid check from store_unboxed_p
Keno Aug 16, 2013
17690a0
is_stable_expr for tuples
Keno Aug 16, 2013
10330fa
Fix tuples branch for some changes since it was introduced
Keno Oct 2, 2013
a93b442
Tuples branch bug-fixes
Keno Oct 5, 2013
0e2c3e6
Fix a missing JL_GC_POP
Keno Oct 25, 2013
f8b79c4
Fix ifelse on the tuple branch
Keno Oct 26, 2013
8217d70
Merge some bugfixes from MCJIT branch
Keno Nov 16, 2013
71a5def
Fix build failure after merge
Keno Nov 17, 2013
665ffe5
Cleanup
Keno Nov 19, 2013
e02db98
Separate out llvmcall
Keno Nov 19, 2013
9deb3a1
Simplify emit_tupleset, but disallowing non-constant ones
Keno Nov 20, 2013
ee26d21
Add a missing GC root
Keno Nov 21, 2013
f9999b1
Fix an improperly adjusted gc frame
Keno Nov 23, 2013
a7d99e6
Fix vararg root counting
Keno Nov 27, 2013
d5ad8e6
Fix a rebase conflict
Keno Nov 27, 2013
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
Prev Previous commit
Next Next commit
Add a missing GC root
  • Loading branch information
@Keno
Keno committed Nov 29, 2013
commit ee26d21ccf92d54f82826074a70c77365ab55c72
5 changes: 2 additions & 3 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,8 +1406,8 @@ static Value *emit_known_call(jl_value_t *ff, jl_value_t **args, size_t nargs,
break;
}
if (i >= nargs) {
// all arguments immutable; can be statically evaluated
jl_value_t *tt = (jl_value_t*)jl_alloc_tuple_uninit(nargs);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this needs to be gc rooted.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect you're probably right.

JL_GC_PUSH1(&tt);
for(i=0; i < nargs; i++) {
jl_tupleset(tt, i, expr_type(args[i+1],ctx));
}
Expand All @@ -1430,6 +1430,7 @@ static Value *emit_known_call(jl_value_t *ff, jl_value_t **args, size_t nargs,
tpl = emit_tupleset(tpl,ConstantInt::get(T_size,i+1),elt,tt,ctx);
}
JL_GC_POP();
JL_GC_POP();
return tpl;
}

Expand Down Expand Up @@ -2682,8 +2683,6 @@ static Function *gen_jlcall_wrapper(jl_lambda_info_t *lam, jl_expr_t *ast, Funct
finalize_gc_frame(&ctx);
builder.CreateRet(r);

verifyFunction(*w);

return w;
}

Expand Down