From c4b4cb36c83f1fe581dc9d20c25baa2d2ed23e42 Mon Sep 17 00:00:00 2001 From: Andreas Martens Date: Sat, 17 Aug 2013 22:42:31 +0200 Subject: [PATCH 1/2] Fix segfault when calling tuple struct constructor as extern fn Fixes #5315 --- src/librustc/middle/trans/expr.rs | 8 ++++++-- .../tuple-struct-constructor-pointer.rs | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/test/run-pass/tuple-struct-constructor-pointer.rs diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 04fd477a317..1ec067d271f 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -795,14 +795,18 @@ fn trans_def_dps_unadjusted(bcx: @mut Block, ref_expr: &ast::expr, return bcx; } } - ast::def_struct(*) => { + ast::def_struct(def_id) => { let ty = expr_ty(bcx, ref_expr); match ty::get(ty).sty { ty::ty_struct(did, _) if ty::has_dtor(ccx.tcx, did) => { let repr = adt::represent_type(ccx, ty); adt::trans_start_init(bcx, repr, lldest, 0); } - _ => {} + ty::ty_bare_fn(*) => { + let fn_data = callee::trans_fn_ref(bcx, def_id, ref_expr.id); + Store(bcx, fn_data.llfn, lldest); + } + _ => () } return bcx; } diff --git a/src/test/run-pass/tuple-struct-constructor-pointer.rs b/src/test/run-pass/tuple-struct-constructor-pointer.rs new file mode 100644 index 00000000000..ad2acc4ad4f --- /dev/null +++ b/src/test/run-pass/tuple-struct-constructor-pointer.rs @@ -0,0 +1,19 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +struct Foo(int); +struct Bar(int, int); + +fn main() { + let f: extern fn(int) -> Foo = Foo; + let g: extern fn(int, int) -> Bar = Bar; + f(42); + g(4, 7); +} From 29ab2daa5efebb59b5ad4a2710d570e89696e583 Mon Sep 17 00:00:00 2001 From: Andreas Martens Date: Sun, 18 Aug 2013 21:37:40 +0200 Subject: [PATCH 2/2] Add assertions to test --- src/test/run-pass/tuple-struct-constructor-pointer.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/run-pass/tuple-struct-constructor-pointer.rs b/src/test/run-pass/tuple-struct-constructor-pointer.rs index ad2acc4ad4f..dbb5db649ef 100644 --- a/src/test/run-pass/tuple-struct-constructor-pointer.rs +++ b/src/test/run-pass/tuple-struct-constructor-pointer.rs @@ -8,12 +8,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#[deriving(Eq)] struct Foo(int); +#[deriving(Eq)] struct Bar(int, int); fn main() { let f: extern fn(int) -> Foo = Foo; let g: extern fn(int, int) -> Bar = Bar; - f(42); - g(4, 7); + assert_eq!(f(42), Foo(42)); + assert_eq!(g(4, 7), Bar(4, 7)); }