Thanks to visit codestin.com
Credit goes to github.com

Skip to content

First round of LLVM 6.0.0 compatibility #47710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 26, 2018
Merged

First round of LLVM 6.0.0 compatibility #47710

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
03f86ae
llvm6: CodeModel::{JIT,}Default no longer exists
alexcrichton Jan 23, 2018
2a7ed74
llvm6: Missing include for LLVM 6 in PassWrapper.cpp
alexcrichton Jan 23, 2018
9eeecd2
llvm6: Tweak fast math intrinsics
alexcrichton Jan 23, 2018
b6fe112
llvm6: Remove MIPS64 archive variant
alexcrichton Jan 23, 2018
caedb36
llvm6: Different return value for writeArchive
alexcrichton Jan 23, 2018
63b3168
llvm6: Don't clone LLVM modules on wasm
alexcrichton Jan 24, 2018
e9a6499
llvm6: Update FreeBSD images to Ubuntu 18.04
alexcrichton Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
llvm6: Don't clone LLVM modules on wasm 
The comment for why cloning exists doesn't actually apply for wasm today and
apparently cloning is causing subtle bugs in LLVM, so let's just avoid it
altogether. More specifically after we emit the assembly for the wasm target we
don't actually use the module again, so there's no need to keep both around.

This seemed to be causing some scary verifier assertions in LLVM which seemed to
be uncovered by presumably (?) buggy behavior. Let's just avoid it for now and
make the wasm target slightly more lean in the process.
  • Loading branch information
@alexcrichton
alexcrichton committed Jan 24, 2018
commit 63b3168448061a510915d76630c6803de8cac595
4 changes: 2 additions & 2 deletions src/librustc_trans/back/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ unsafe fn codegen(cgcx: &CodegenContext,
// We can't use the same module for asm and binary output, because that triggers
// various errors like invalid IR or broken binaries, so we might have to clone the
// module to produce the asm output
let llmod = if config.emit_obj {
let llmod = if config.emit_obj && !asm2wasm {
llvm::LLVMCloneModule(llmod)
} else {
llmod
Expand All @@ -742,7 +742,7 @@ unsafe fn codegen(cgcx: &CodegenContext,
write_output_file(diag_handler, tm, cpm, llmod, &path,
llvm::FileType::AssemblyFile)
})?;
if config.emit_obj {
if config.emit_obj && !asm2wasm {
llvm::LLVMDisposeModule(llmod);
}
timeline.record("asm");
Expand Down