diff --git a/src/librustc/middle/intrinsicck.rs b/src/librustc/middle/intrinsicck.rs index 6669147b0dcac..9b7cd44196d7a 100644 --- a/src/librustc/middle/intrinsicck.rs +++ b/src/librustc/middle/intrinsicck.rs @@ -73,9 +73,13 @@ struct IntrinsicCheckingVisitor<'a> { impl<'a> IntrinsicCheckingVisitor<'a> { fn def_id_is_transmute(&self, def_id: DefId) -> bool { + let intrinsic = match ty::get(ty::lookup_item_type(self.tcx, def_id).ty).sty { + ty::ty_bare_fn(ref bfty) => bfty.abi == RustIntrinsic, + _ => return false + }; if def_id.krate == ast::LOCAL_CRATE { match self.tcx.map.get(def_id.node) { - NodeForeignItem(ref item) => { + NodeForeignItem(ref item) if intrinsic => { token::get_ident(item.ident) == token::intern_and_get_ident("transmute") } @@ -83,11 +87,11 @@ impl<'a> IntrinsicCheckingVisitor<'a> { } } else { match csearch::get_item_path(self.tcx, def_id).last() { - None => false, - Some(ref last) => { + Some(ref last) if intrinsic => { token::get_name(last.name()) == token::intern_and_get_ident("transmute") } + _ => false, } } } diff --git a/src/test/auxiliary/issue-15562.rs b/src/test/auxiliary/issue-15562.rs new file mode 100644 index 0000000000000..76243d3bcedb0 --- /dev/null +++ b/src/test/auxiliary/issue-15562.rs @@ -0,0 +1,15 @@ +// 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 = "lib"] + +extern { + pub fn transmute(); +} diff --git a/src/test/run-pass/issue-15562.rs b/src/test/run-pass/issue-15562.rs new file mode 100644 index 0000000000000..96de6c90b66f0 --- /dev/null +++ b/src/test/run-pass/issue-15562.rs @@ -0,0 +1,29 @@ +// 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. + +// aux-build:issue-15562.rs + +extern crate i = "issue-15562"; + +pub fn main() { + extern { + fn transmute(); + } + unsafe { + transmute(); + i::transmute(); + } +} + +// We declare this so we don't run into unresolved symbol errors +// The above extern is NOT `extern "rust-intrinsic"` and thus +// means it'll try to find a corresponding symbol to link to. +#[no_mangle] +pub extern fn transmute() {}