0107028991
In #8185 cross-crate condition handlers were fixed by ensuring that globals didn't start appearing in different crates with different addressed. An unfortunate side effect of that pull request is that constants weren't inlined across crates (uint::bits is unknown to everything but libstd). This commit fixes this inlining by using the `available_eternally` linkage provided by LLVM. It partially reverts #8185, and then adds support for this linkage type. The main caveat is that not all statics could be inlined into other crates. Before this patch, all statics were considered "inlineable items", but an unfortunate side effect of how we deal with `&static` and `&[static]` means that these two cases cannot be inlined across crates. The translation of constants was modified to propogate this condition of whether a constant should be considered inlineable into other crates. Closes #9036
29 lines
896 B
Rust
29 lines
896 B
Rust
// Copyright 2013 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.
|
|
|
|
// xfail-fast
|
|
// aux-build:xcrate_static_addresses.rs
|
|
|
|
extern mod xcrate_static_addresses;
|
|
|
|
use other = xcrate_static_addresses;
|
|
|
|
pub fn main() {
|
|
other::verify_same(&other::global);
|
|
other::verify_same2(other::global2);
|
|
|
|
// Previously this fail'd because there were two addresses that were being
|
|
// used when declaring constants.
|
|
do other::test::cond.trap(|_| {
|
|
}).inside {
|
|
other::raise();
|
|
}
|
|
}
|