From ae929427582a83ba06a03093a76dea31b37a88b7 Mon Sep 17 00:00:00 2001 From: Brian Koropoff Date: Sat, 1 Nov 2014 18:49:48 -0700 Subject: [PATCH 1/2] Fix def ID mapping for method defs This prevents def IDs with the wrong crate ID from showing up when using UFCS. Closes #18501 --- src/librustc/middle/astencode.rs | 16 +++++----------- src/librustc/middle/def.rs | 9 +++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 3d2bd763a1434..988f7d46f5f95 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -441,19 +441,13 @@ impl tr for def::Def { fn tr(&self, dcx: &DecodeContext) -> def::Def { match *self { def::DefFn(did, is_ctor) => def::DefFn(did.tr(dcx), is_ctor), - def::DefStaticMethod(did, wrapped_did2) => { - def::DefStaticMethod(did.tr(dcx), - match wrapped_did2 { - def::FromTrait(did2) => { - def::FromTrait(did2.tr(dcx)) - } - def::FromImpl(did2) => { - def::FromImpl(did2.tr(dcx)) - } - }) + def::DefStaticMethod(did, p) => { + def::DefStaticMethod(did.tr(dcx), p.map(|did2| did2.tr(dcx))) } def::DefMethod(did0, did1, p) => { - def::DefMethod(did0.tr(dcx), did1.map(|did1| did1.tr(dcx)), p) + def::DefMethod(did0.tr(dcx), + did1.map(|did1| did1.tr(dcx)), + p.map(|did2| did2.tr(dcx))) } def::DefSelfTy(nid) => { def::DefSelfTy(dcx.tr_id(nid)) } def::DefMod(did) => { def::DefMod(did.tr(dcx)) } diff --git a/src/librustc/middle/def.rs b/src/librustc/middle/def.rs index a71f714a2efd7..160bb2238e7db 100644 --- a/src/librustc/middle/def.rs +++ b/src/librustc/middle/def.rs @@ -55,6 +55,15 @@ pub enum MethodProvenance { FromImpl(ast::DefId), } +impl MethodProvenance { + pub fn map(self, f: |ast::DefId| -> ast::DefId) -> MethodProvenance { + match self { + FromTrait(did) => FromTrait(f(did)), + FromImpl(did) => FromImpl(f(did)) + } + } +} + impl Def { pub fn def_id(&self) -> ast::DefId { match *self { From 949dbc11ffe5767ae744d40b7eb4b5fa9204b9b1 Mon Sep 17 00:00:00 2001 From: Brian Koropoff Date: Sat, 1 Nov 2014 19:07:51 -0700 Subject: [PATCH 2/2] Add regression test for #18501 --- src/test/auxiliary/issue-18501.rs | 27 +++++++++++++++++++++++++++ src/test/run-pass/issue-18501.rs | 20 ++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/test/auxiliary/issue-18501.rs create mode 100644 src/test/run-pass/issue-18501.rs diff --git a/src/test/auxiliary/issue-18501.rs b/src/test/auxiliary/issue-18501.rs new file mode 100644 index 0000000000000..af3bc20378c39 --- /dev/null +++ b/src/test/auxiliary/issue-18501.rs @@ -0,0 +1,27 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_type = "rlib"] +struct Foo; + +trait Tr { + fn tr(&self); +} + +impl Tr for Foo { + fn tr(&self) {} +} + +fn take_method(f: fn(&T), t: &T) {} + +#[inline] +pub fn pass_method() { + take_method(Tr::tr, &Foo); +} diff --git a/src/test/run-pass/issue-18501.rs b/src/test/run-pass/issue-18501.rs new file mode 100644 index 0000000000000..ce026942948ca --- /dev/null +++ b/src/test/run-pass/issue-18501.rs @@ -0,0 +1,20 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that we don't ICE when inlining a function from another +// crate that uses a trait method as a value due to incorrectly +// translating the def ID of the trait during AST decoding. + +// aux-build:issue-18501.rs +extern crate "issue-18501" as issue; + +fn main() { + issue::pass_method(); +}