From 4a85b08e08456920f07cf8bb583064f84c23575d Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Sat, 27 Jul 2013 04:38:55 -0400 Subject: [PATCH 1/2] librustc: Stop trying to make invalid slice with vec in static. --- src/librustc/middle/trans/consts.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/librustc/middle/trans/consts.rs b/src/librustc/middle/trans/consts.rs index db9e3db2c0fda..853b3a3c28f1c 100644 --- a/src/librustc/middle/trans/consts.rs +++ b/src/librustc/middle/trans/consts.rs @@ -211,11 +211,16 @@ pub fn const_expr(cx: @mut CrateContext, e: @ast::expr) -> ValueRef { } ty::AutoBorrowVec(ty::re_static, m) => { assert!(m != ast::m_mutbl); - let size = machine::llsize_of(cx, - val_ty(llconst)); assert_eq!(abi::slice_elt_base, 0); assert_eq!(abi::slice_elt_len, 1); - llconst = C_struct([llptr, size]); + + match ty::get(ty).sty { + ty::ty_evec(_, ty::vstore_fixed(*)) => { + let size = machine::llsize_of(cx, val_ty(llconst)); + llconst = C_struct([llptr, size]); + } + _ => {} + } } _ => { cx.sess.span_bug(e.span, From 68b61e8cc905eee36c69a74689119893df3cc872 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Sat, 27 Jul 2013 04:46:10 -0400 Subject: [PATCH 2/2] Add test for #5917. --- src/test/run-pass/static-vec-autoref.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/test/run-pass/static-vec-autoref.rs diff --git a/src/test/run-pass/static-vec-autoref.rs b/src/test/run-pass/static-vec-autoref.rs new file mode 100644 index 0000000000000..8d6f08583dbe4 --- /dev/null +++ b/src/test/run-pass/static-vec-autoref.rs @@ -0,0 +1,21 @@ +// Copyright 2013 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 T(&'static [int]); + +static A: T = T(&'static [5, 4, 3]); +static B: T = T(&[5, 4, 3]); +static C: T = T([5, 4, 3]); + +pub fn main() { + assert_eq!(A[0], 5); + assert_eq!(B[1], 4); + assert_eq!(C[2], 3); +}