Make globals with private linkage unnamed. Fixes #50862.
This commit is contained in:
Colin Pronovost
parent
e94df4acb4
commit
02190f397e
12 changed files with 42 additions and 51 deletions
|
|
@ -66,16 +66,22 @@ pub fn addr_of_mut(
|
|||
cx: &CodegenCx<'ll, '_>,
|
||||
cv: &'ll Value,
|
||||
align: Align,
|
||||
kind: &str,
|
||||
kind: Option<&str>,
|
||||
) -> &'ll Value {
|
||||
unsafe {
|
||||
let name = cx.generate_local_symbol_name(kind);
|
||||
let gv = declare::define_global(cx, &name[..], val_ty(cv)).unwrap_or_else(||{
|
||||
bug!("symbol `{}` is already defined", name);
|
||||
});
|
||||
let gv = match kind {
|
||||
Some(kind) if !cx.tcx.sess.fewer_names() => {
|
||||
let name = cx.generate_local_symbol_name(kind);
|
||||
let gv = declare::define_global(cx, &name[..], val_ty(cv)).unwrap_or_else(||{
|
||||
bug!("symbol `{}` is already defined", name);
|
||||
});
|
||||
llvm::LLVMRustSetLinkage(gv, llvm::Linkage::PrivateLinkage);
|
||||
gv
|
||||
},
|
||||
_ => declare::define_private_global(cx, val_ty(cv)),
|
||||
};
|
||||
llvm::LLVMSetInitializer(gv, cv);
|
||||
set_global_alignment(cx, gv, align);
|
||||
llvm::LLVMRustSetLinkage(gv, llvm::Linkage::PrivateLinkage);
|
||||
SetUnnamedAddr(gv, true);
|
||||
gv
|
||||
}
|
||||
|
|
@ -85,7 +91,7 @@ pub fn addr_of(
|
|||
cx: &CodegenCx<'ll, '_>,
|
||||
cv: &'ll Value,
|
||||
align: Align,
|
||||
kind: &str,
|
||||
kind: Option<&str>,
|
||||
) -> &'ll Value {
|
||||
if let Some(&gv) = cx.const_globals.borrow().get(&cv) {
|
||||
unsafe {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use value::Value;
|
|||
|
||||
use std::ffi::CString;
|
||||
|
||||
|
||||
/// Declare a global value.
|
||||
///
|
||||
/// If there’s a value with the same name already declared, the function will
|
||||
|
|
@ -170,6 +169,15 @@ pub fn define_global(cx: &CodegenCx<'ll, '_>, name: &str, ty: &'ll Type) -> Opti
|
|||
}
|
||||
}
|
||||
|
||||
/// Declare a private global
|
||||
///
|
||||
/// Use this function when you intend to define a global without a name.
|
||||
pub fn define_private_global(cx: &CodegenCx<'ll, '_>, ty: &'ll Type) -> &'ll Value {
|
||||
unsafe {
|
||||
llvm::LLVMRustInsertPrivateGlobal(cx.llmod, ty)
|
||||
}
|
||||
}
|
||||
|
||||
/// Declare a Rust function with an intention to define it.
|
||||
///
|
||||
/// Use this function when you intend to define a function. This function will
|
||||
|
|
|
|||
|
|
@ -622,6 +622,7 @@ extern "C" {
|
|||
pub fn LLVMAddGlobal(M: &'a Module, Ty: &'a Type, Name: *const c_char) -> &'a Value;
|
||||
pub fn LLVMGetNamedGlobal(M: &Module, Name: *const c_char) -> Option<&Value>;
|
||||
pub fn LLVMRustGetOrInsertGlobal(M: &'a Module, Name: *const c_char, T: &'a Type) -> &'a Value;
|
||||
pub fn LLVMRustInsertPrivateGlobal(M: &'a Module, T: &'a Type) -> &'a Value;
|
||||
pub fn LLVMGetFirstGlobal(M: &Module) -> Option<&Value>;
|
||||
pub fn LLVMGetNextGlobal(GlobalVar: &Value) -> Option<&Value>;
|
||||
pub fn LLVMDeleteGlobal(GlobalVar: &Value);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ pub fn get_vtable(
|
|||
|
||||
let vtable_const = C_struct(cx, &components, false);
|
||||
let align = cx.data_layout().pointer_align;
|
||||
let vtable = consts::addr_of(cx, vtable_const, align, "vtable");
|
||||
let vtable = consts::addr_of(cx, vtable_const, align, Some("vtable"));
|
||||
|
||||
debuginfo::create_vtable_metadata(cx, ty, vtable);
|
||||
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ impl FunctionCx<'a, 'll, 'tcx> {
|
|||
let file_line_col = consts::addr_of(bx.cx,
|
||||
file_line_col,
|
||||
align,
|
||||
"panic_bounds_check_loc");
|
||||
Some("panic_bounds_check_loc"));
|
||||
(lang_items::PanicBoundsCheckFnLangItem,
|
||||
vec![file_line_col, index, len])
|
||||
}
|
||||
|
|
@ -391,7 +391,7 @@ impl FunctionCx<'a, 'll, 'tcx> {
|
|||
let msg_file_line_col = consts::addr_of(bx.cx,
|
||||
msg_file_line_col,
|
||||
align,
|
||||
"panic_loc");
|
||||
Some("panic_loc"));
|
||||
(lang_items::PanicFnLangItem,
|
||||
vec![msg_file_line_col])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@ pub fn scalar_to_llvm(
|
|||
Some(AllocType::Memory(alloc)) => {
|
||||
let init = const_alloc_to_llvm(cx, alloc);
|
||||
if alloc.runtime_mutability == Mutability::Mutable {
|
||||
consts::addr_of_mut(cx, init, alloc.align, "byte_str")
|
||||
consts::addr_of_mut(cx, init, alloc.align, None)
|
||||
} else {
|
||||
consts::addr_of(cx, init, alloc.align, "byte_str")
|
||||
consts::addr_of(cx, init, alloc.align, None)
|
||||
}
|
||||
}
|
||||
Some(AllocType::Function(fn_instance)) => {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ impl PlaceRef<'ll, 'tcx> {
|
|||
offset: Size,
|
||||
) -> PlaceRef<'ll, 'tcx> {
|
||||
let init = const_alloc_to_llvm(bx.cx, alloc);
|
||||
let base_addr = consts::addr_of(bx.cx, init, layout.align, "byte_str");
|
||||
let base_addr = consts::addr_of(bx.cx, init, layout.align, None);
|
||||
|
||||
let llval = unsafe { LLVMConstInBoundsGEP(
|
||||
consts::bitcast(base_addr, Type::i8p(bx.cx)),
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include "llvm/IR/DebugInfoMetadata.h"
|
||||
#include "llvm/IR/DiagnosticInfo.h"
|
||||
#include "llvm/IR/DiagnosticPrinter.h"
|
||||
#include "llvm/IR/GlobalVariable.h"
|
||||
#include "llvm/IR/Instructions.h"
|
||||
#include "llvm/Object/Archive.h"
|
||||
#include "llvm/Object/ObjectFile.h"
|
||||
|
|
@ -116,6 +117,15 @@ LLVMRustGetOrInsertGlobal(LLVMModuleRef M, const char *Name, LLVMTypeRef Ty) {
|
|||
return wrap(unwrap(M)->getOrInsertGlobal(Name, unwrap(Ty)));
|
||||
}
|
||||
|
||||
extern "C" LLVMValueRef
|
||||
LLVMRustInsertPrivateGlobal(LLVMModuleRef M, LLVMTypeRef Ty) {
|
||||
return wrap(new GlobalVariable(*unwrap(M),
|
||||
unwrap(Ty),
|
||||
false,
|
||||
GlobalValue::PrivateLinkage,
|
||||
nullptr));
|
||||
}
|
||||
|
||||
extern "C" LLVMTypeRef LLVMRustMetadataTypeInContext(LLVMContextRef C) {
|
||||
return wrap(Type::getMetadataTy(*unwrap(C)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
// CHECK: @STATIC = {{.*}}, align 4
|
||||
|
||||
// This checks the constants from inline_enum_const
|
||||
// CHECK: @byte_str.{{[0-9]+}} = {{.*}}, align 2
|
||||
// CHECK: @{{[0-9]+}} = {{.*}}, align 2
|
||||
|
||||
// This checks the constants from {low,high}_align_const, they share the same
|
||||
// constant, but the alignment differs, so the higher one should be used
|
||||
// CHECK: [[LOW_HIGH:@byte_str.[0-9]+]] = {{.*}}, align 4
|
||||
// CHECK: [[LOW_HIGH:@[0-9]+]] = {{.*}}, align 4
|
||||
|
||||
#[derive(Copy, Clone)]
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mod aux_mod;
|
|||
include!("aux_mod.rs");
|
||||
|
||||
// Here we check that the expansion of the file!() macro is mapped.
|
||||
// CHECK: @byte_str.1 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>, align 1
|
||||
// CHECK: @0 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>, align 1
|
||||
pub static FILE_PATH: &'static str = file!();
|
||||
|
||||
fn main() {
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
-include ../tools.mk
|
||||
|
||||
# check that the compile generated symbols for strings, binaries,
|
||||
# vtables, etc. have semisane names (e.g. `str.1234`); it's relatively
|
||||
# easy to accidentally modify the compiler internals to make them
|
||||
# become things like `str"str"(1234)`.
|
||||
|
||||
OUT=$(TMPDIR)/lib.s
|
||||
|
||||
all:
|
||||
$(RUSTC) lib.rs --emit=asm --crate-type=staticlib
|
||||
# just check for symbol declarations with the names we're expecting.
|
||||
$(CGREP) -e 'str\.[0-9]+:' 'byte_str\.[0-9]+:' 'vtable\.[0-9]+' < $(OUT)
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
// 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 <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.
|
||||
|
||||
pub static X: &'static str = "foobarbaz";
|
||||
pub static Y: &'static [u8] = include_bytes!("lib.rs");
|
||||
|
||||
trait Foo { fn dummy(&self) { } }
|
||||
impl Foo for usize {}
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn dummy() {
|
||||
// force the vtable to be created
|
||||
let _x = &1usize as &Foo;
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue