Skip to content

Commit

Permalink
rustc: check instantiability of fixed length vectors properly.
Browse files Browse the repository at this point in the history
Previously, they were treated like ~[] and &[] (which can have length
0), but fixed length vectors are fixed length, i.e. we know at compile
time if it's possible to have length zero (which is only for [T, .. 0]).

Fixes #11659.
  • Loading branch information
huonw committed Jan 19, 2014
1 parent d0f6ef0 commit 6f3c202
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/librustc/middle/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2287,6 +2287,12 @@ pub fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
::util::ppaux::ty_to_str(cx, ty));

let r = match get(ty).sty {
// fixed length vectors need special treatment compared to
// normal vectors, since they don't necessarily have the
// possibilty to have length zero.
ty_vec(_, vstore_fixed(0)) => false, // don't need no contents
ty_vec(mt, vstore_fixed(_)) => type_requires(cx, seen, r_ty, mt.ty),

ty_nil |
ty_bot |
ty_bool |
Expand Down
26 changes: 26 additions & 0 deletions src/test/compile-fail/uninstantiable-fixed-length-vec.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2014 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.

// issue #11659, the compiler needs to know that a fixed length vector
// always requires instantiable contents to instantiable itself
// (unlike a ~[] vector which can have length zero).

// ~ to avoid infinite size.
struct Uninstantiable { //~ ERROR cannot be instantiated without an instance of itself
p: ~[Uninstantiable, .. 1]
}

struct Instantiable { p: ~[Instantiable, .. 0] }


fn main() {
let _ = None::<Uninstantiable>;
let _ = Instantiable { p: ~([]) };
}

9 comments on commit 6f3c202

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

saw approval from thestinger
at huonw@6f3c202

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

merging huonw/rust/fixed-length-instantiation = 6f3c202 into auto

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

huonw/rust/fixed-length-instantiation = 6f3c202 merged ok, testing candidate = 60914db4

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

saw approval from thestinger
at huonw@6f3c202

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

merging huonw/rust/fixed-length-instantiation = 6f3c202 into auto

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

huonw/rust/fixed-length-instantiation = 6f3c202 merged ok, testing candidate = 02d4572

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 6f3c202 Jan 20, 2014

Choose a reason for hiding this comment

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

fast-forwarding master to auto = 02d4572

Please sign in to comment.