diff options
| -rw-r--r-- | src/librustc_trans/trans/base.rs | 11 | ||||
| -rw-r--r-- | src/test/run-pass/zero-sized-tuple-struct.rs | 21 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index 28047ee5812..99a00155c3b 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -1758,6 +1758,17 @@ pub fn trans_named_tuple_constructor<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, } _ => ccx.sess().bug("expected expr as arguments for variant/struct tuple constructor") } + } else { + // Just eval all the expressions (if any). Since expressions in Rust can have arbitrary + // contents, there could be side-effects we need from them. + match args { + callee::ArgExprs(exprs) => { + for expr in exprs { + bcx = expr::trans_into(bcx, expr, expr::Ignore); + } + } + _ => () + } } // If the caller doesn't care about the result diff --git a/src/test/run-pass/zero-sized-tuple-struct.rs b/src/test/run-pass/zero-sized-tuple-struct.rs new file mode 100644 index 00000000000..aaffdc4ec7c --- /dev/null +++ b/src/test/run-pass/zero-sized-tuple-struct.rs @@ -0,0 +1,21 @@ +// 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 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![allow(unused_assignments)] + +// Make sure that the constructor args are translated for zero-sized tuple structs + +struct Foo(()); + +fn main() { + let mut a = 1; + Foo({ a = 2 }); + assert_eq!(a, 2); +} |