trans: don't declare symbols that were already imported. #32742
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -158,15 +158,22 @@ pub fn get_defined_value(ccx: &CrateContext, name: &str) -> Option<ValueRef> { | |||
| debug!("get_defined_value: {:?} value is null", name); | |||
| None | |||
There was a problem hiding this comment.
Should say get_declared_value
|
Added the testcase to an existing duplicated FFI import test and confirmed that the snapshot compiler segfaults (because it has LLVM assertions turned off) and an older stage2 build I had laying around triggers the LLVM assertion, while stage1 passes the test. |
|
@bors r+ |
|
📌 Commit e17c48b has been approved by |
|
@bors p=1 Probably unblocks servo/servo#10173 |
|
I confirm that I don't get the compilation error anymore, with this patch. Thanks @eddyb 😃 |
|
@bors-servo p=20 rollum shmollup this is more important |
bors
added a commit
that referenced
this pull request
Apr 5, 2016
trans: don't declare symbols that were already imported. Fixes #32740 by checking for a declaration before attempting a new one. Before, `LLVMGetOrInsertFunction` was called for a existing import, but with a different type. The returned value was a cast function pointer instead of a declaration, and we gave this value to `llvm::SetFunctionCallConv` & friends , which triggered an LLVM assertion.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Apr 15, 2016
trans: always register an item's symbol, even if duplicated. Fixes rust-lang#32783 which was introduced by not always registering item symbols in rust-lang#32742.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #32740 by checking for a declaration before attempting a new one.
Before,
LLVMGetOrInsertFunctionwas called for a existing import, but with a different type.The returned value was a cast function pointer instead of a declaration, and we gave this
value to
llvm::SetFunctionCallConv& friends , which triggered an LLVM assertion.