Rollup merge of #52635 - yodaldevoid:issue_18804, r=oli-obk
Fix #[linkage] propagation though generic functions Fixes #18804 In the non-local branch of `get_static` (where the fix was implemented) `span_fatal` had to be replaced with `bug!` as we have no span in that case.
This commit is contained in:
commit
c7555cedde
3 changed files with 121 additions and 47 deletions
20
src/test/run-pass/issue-18804/auxiliary/lib.rs
Normal file
20
src/test/run-pass/issue-18804/auxiliary/lib.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// Copyright 2018 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.
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
#![feature(linkage)]
|
||||
|
||||
pub fn foo<T>() -> *const() {
|
||||
extern {
|
||||
#[linkage = "extern_weak"]
|
||||
static FOO: *const();
|
||||
}
|
||||
unsafe { FOO }
|
||||
}
|
||||
23
src/test/run-pass/issue-18804/main.rs
Normal file
23
src/test/run-pass/issue-18804/main.rs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
// Copyright 2018 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 for issue #18804, #[linkage] does not propagate thorugh generic
|
||||
// functions. Failure results in a linker error.
|
||||
|
||||
// ignore-asmjs no weak symbol support
|
||||
// ignore-emscripten no weak symbol support
|
||||
|
||||
// aux-build:lib.rs
|
||||
|
||||
extern crate lib;
|
||||
|
||||
fn main() {
|
||||
lib::foo::<i32>();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue