Skip to content

Commit

Permalink
When generating WF criteria, do not visit the same type more than
Browse files Browse the repository at this point in the history
once. Fixes an infinite stack overflow (rust-lang#23003).
  • Loading branch information
nikomatsakis committed Mar 4, 2015
1 parent 14f0942 commit 8c28284
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/librustc_typeck/check/implicator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use syntax::ast;
use syntax::codemap::Span;

use util::common::ErrorReported;
use util::nodemap::FnvHashSet;
use util::ppaux::Repr;

// Helper functions related to manipulating region types.
Expand All @@ -40,6 +41,7 @@ struct Implicator<'a, 'tcx: 'a> {
stack: Vec<(ty::Region, Option<Ty<'tcx>>)>,
span: Span,
out: Vec<Implication<'tcx>>,
visited: FnvHashSet<Ty<'tcx>>,
}

/// This routine computes the well-formedness constraints that must hold for the type `ty` to
Expand All @@ -65,7 +67,8 @@ pub fn implications<'a,'tcx>(
body_id: body_id,
span: span,
stack: stack,
out: Vec::new() };
out: Vec::new(),
visited: FnvHashSet() };
wf.accumulate_from_ty(ty);
debug!("implications: out={}", wf.out.repr(closure_typer.tcx()));
wf.out
Expand All @@ -80,6 +83,12 @@ impl<'a, 'tcx> Implicator<'a, 'tcx> {
debug!("accumulate_from_ty(ty={})",
ty.repr(self.tcx()));

// When expanding out associated types, we can visit a cyclic
// set of types. Issue #23003.
if !self.visited.insert(ty) {
return;
}

match ty.sty {
ty::ty_bool |
ty::ty_char |
Expand Down
38 changes: 38 additions & 0 deletions src/test/compile-fail/traits-issue-23003-overflow.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2015 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.

// A variant of traits-issue-23003 in which an infinite series of
// types are required. This currently creates an overflow. This test
// is included to ensure that some controlled failure, at least,
// results -- but it might be that we should adjust the rules somewhat
// to make this legal. -nmatsakis

use std::marker::PhantomData;

trait Async {
type Cancel;
}

struct Receipt<A:Async> {
marker: PhantomData<A>,
}

struct Complete<B> {
core: Option<B>,
}

impl<B> Async for Complete<B> {
type Cancel = Receipt<Complete<Option<B>>>;
}

fn foo(r: Receipt<Complete<()>>) { }
//~^ ERROR overflow

fn main() { }
39 changes: 39 additions & 0 deletions src/test/run-pass/traits-issue-23003.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright 2015 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.

// Test stack overflow triggered by evaluating the implications. To be
// WF, the type `Receipt<Complete>` would require that `<Complete as
// Async>::Cancel` be WF. This normalizes to `Receipt<Complete>`
// again, leading to an infinite cycle. Issue #23003.

#![allow(dead_code)]
#![allow(unused_variables)]

use std::marker::PhantomData;

trait Async {
type Cancel;
}

struct Receipt<A:Async> {
marker: PhantomData<A>,
}

struct Complete {
core: Option<()>,
}

impl Async for Complete {
type Cancel = Receipt<Complete>;
}

fn foo(r: Receipt<Complete>) { }

fn main() { }

0 comments on commit 8c28284

Please sign in to comment.