mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow different global references to the same name

Browse Source 
Combining CGUs can result in code that references a static variable through both
an Item and a ForeignItem with the same name. We don't care that the global was
already created by a ForeignItem reference when we see the Item reference, as
long as the LLVM types of the ForeignItem and Item match.

Fixes #66464
This commit is contained in:
Stephen Crane 2019-11-18 15:22:55 -08:00
parent a0d40f8bdf
commit 32168a3df7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_codegen_llvm/consts.rs
View File

@ -233,11 +233,13 @@ impl CodegenCx<'ll, 'tcx> {
ref attrs, span, kind: hir::ItemKind::Static(..), .. ref attrs, span, kind: hir::ItemKind::Static(..), ..
}) => { }) => {
let sym_str = sym.as_str(); let sym_str = sym.as_str();
if self.get_declared_value(&sym_str).is_some() { if let Some(g) = self.get_declared_value(&sym_str) {
span_bug!(span, "Conflicting symbol names for static?"); if self.val_ty(g) != self.type_ptr_to(llty) {
span_bug!(span, "Conflicting types for static");
}
} }
let g = self.define_global(&sym_str, llty).unwrap(); let g = self.declare_global(&sym_str, llty);
if !self.tcx.is_reachable_non_generic(def_id) { if !self.tcx.is_reachable_non_generic(def_id) {
unsafe { unsafe {