Skip to content

Commit 5ab11d7

Browse files
committed
Auto merge of #32667 - dotdash:def_dec, r=nagisa
Stop accepting declarations when looking for definitions eternally_available linkage isn't legal for declarations anyway, so the check for an externally_available declaration should never succeed, so let's remove it.
2 parents 3ec71b0 + 4b9ddf4 commit 5ab11d7

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/librustc_trans/declare.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use context::CrateContext;
2828
use type_::Type;
2929

3030
use std::ffi::CString;
31-
use libc::c_uint;
3231

3332

3433
/// Declare a global value.
@@ -159,14 +158,12 @@ pub fn get_defined_value(ccx: &CrateContext, name: &str) -> Option<ValueRef> {
159158
debug!("get_defined_value: {:?} value is null", name);
160159
None
161160
} else {
162-
let (declaration, aext_link) = unsafe {
163-
let linkage = llvm::LLVMGetLinkage(val);
164-
(llvm::LLVMIsDeclaration(val) != 0,
165-
linkage == llvm::AvailableExternallyLinkage as c_uint)
161+
let declaration = unsafe {
162+
llvm::LLVMIsDeclaration(val) != 0
166163
};
167-
debug!("get_defined_value: found {:?} value (declaration: {}, \
168-
aext_link: {})", name, declaration, aext_link);
169-
if !declaration || aext_link {
164+
debug!("get_defined_value: found {:?} value (declaration: {})",
165+
name, declaration);
166+
if !declaration {
170167
Some(val)
171168
} else {
172169
None

0 commit comments

Comments
 (0)