Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Properly translate methods with foreign CC
This fixes a general issue of trying to define extern functions inside impl blocks resulting in
ICE.

Fixes #21238
Fixes #20734
Fixes #19047
  • Loading branch information
nagisa committed Feb 22, 2015
1 parent 0c25e6f commit 9be8ec8
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 6 deletions.
20 changes: 14 additions & 6 deletions src/librustc_trans/trans/base.rs
Expand Up @@ -2412,9 +2412,9 @@ fn register_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
-> ValueRef {
if let ty::ty_bare_fn(_, ref f) = node_type.sty {
if f.abi != Rust && f.abi != RustCall {
ccx.sess().span_bug(sp, &format!("only `Rust` or `rust-call` calling conventions \
are valid for this function, but it uses `{:?}`",
f.abi.name));
ccx.sess().span_bug(sp, &format!("only the `{}` or `{}` calling conventions are valid \
for this function; `{}` was specified",
Rust.name(), RustCall.name(), f.abi.name()));
}
} else {
ccx.sess().span_bug(sp, "expected bare rust function")
Expand Down Expand Up @@ -2938,9 +2938,17 @@ fn register_method(ccx: &CrateContext, id: ast::NodeId,

let sym = exported_name(ccx, id, mty, &m.attrs);

let llfn = register_fn(ccx, m.span, sym, id, mty);
set_llvm_fn_attrs(ccx, &m.attrs, llfn);
llfn
if let ty::ty_bare_fn(_, ref f) = mty.sty {
let llfn = if f.abi == Rust || f.abi == RustCall {
register_fn(ccx, m.span, sym, id, mty)
} else {
foreign::register_rust_fn_with_foreign_abi(ccx, m.span, sym, id)
};
set_llvm_fn_attrs(ccx, &m.attrs, llfn);
return llfn;
} else {
ccx.sess().span_bug(m.span, "expected bare rust function");
}
}

pub fn crate_ctxt_to_encode_parms<'a, 'tcx>(cx: &'a SharedCrateContext<'tcx>,
Expand Down
35 changes: 35 additions & 0 deletions src/test/run-pass/extern-methods.rs
@@ -0,0 +1,35 @@
// 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.
trait A {
extern "fastcall" fn test1(i: i32);
extern fn test2(i: i32);
}

struct S;
impl S {
extern "stdcall" fn test3(i: i32) {
assert_eq!(i, 3);
}
}

impl A for S {
extern "fastcall" fn test1(i: i32) {
assert_eq!(i, 1);
}
extern fn test2(i: i32) {
assert_eq!(i, 2);
}
}

fn main() {
<S as A>::test1(1);
<S as A>::test2(2);
S::test3(3);
}

0 comments on commit 9be8ec8

Please sign in to comment.