squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix structure-returns.

Browse source
This commit is contained in:
Graydon Hoare 2010-12-08 15:52:01 -08:00
parent 2b36a8eab4
commit 264de9c7fc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/comp/middle/trans.rs
View file

@ -1611,7 +1611,14 @@ impure fn trans_ret(@block_ctxt cx, &option.t[@ast.expr] e) -> result {
}
alt (e) {
case (some[@ast.expr](_)) {
case (some[@ast.expr](?e)) {
if (typeck.type_is_structural(typeck.expr_ty(e))) {
// We usually treat structurals by-pointer; in particular,
// trans_expr will have given us a structure pointer. But in
// this case we're about to return. LLVM wants a first-class
// value here (which makes sense; the frame is going away!)
r.val = r.bcx.build.Load(r.val);
}
r.val = r.bcx.build.Ret(r.val);
ret r;
}