OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #32667 - dotdash:def_dec, r=nagisa

Browse Source 
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.
This commit is contained in:
bors 2016-04-02 15:52:00 -07:00
commit 5ab11d72ca
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc_trans/declare.rs
View File

@ -28,7 +28,6 @@ use context::CrateContext;
use type_::Type; use type_::Type;
use std::ffi::CString; use std::ffi::CString;
use libc::c_uint;
/// Declare a global value. /// Declare a global value.
@ -159,14 +158,12 @@ pub fn get_defined_value(ccx: &CrateContext, name: &str) -> Option<ValueRef> {
debug!("get_defined_value: {:?} value is null", name); debug!("get_defined_value: {:?} value is null", name);
None None
} else { } else {
let (declaration, aext_link) = unsafe { let declaration = unsafe {
let linkage = llvm::LLVMGetLinkage(val); llvm::LLVMIsDeclaration(val) != 0
(llvm::LLVMIsDeclaration(val) != 0,
linkage == llvm::AvailableExternallyLinkage as c_uint)
}; };
debug!("get_defined_value: found {:?} value (declaration: {}, \ debug!("get_defined_value: found {:?} value (declaration: {})",
aext_link: {})", name, declaration, aext_link); name, declaration);
if !declaration || aext_link { if !declaration {
Some(val) Some(val)
} else { } else {
None None