fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-28 07:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #485 from alexcrichton/fix-llvm

Browse Source 
Work around #483
This commit is contained in:
Nick Fitzgerald 2018-07-16 14:37:43 -07:00 committed by GitHub
commit 1baf8f3ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/cli-support/src/lib.rs
View File

@ -291,6 +291,7 @@ fn extract_programs(module: &mut Module) -> Result<Vec<shared::Program>, Error>
to_remove.push(i); to_remove.push(i);
let mut payload = custom.payload(); let mut payload = custom.payload();
let mut added_programs = Vec::new();
while payload.len() > 0 { while payload.len() > 0 {
let len = ((payload[0] as usize) << 0) let len = ((payload[0] as usize) << 0)
| ((payload[1] as usize) << 8) | ((payload[1] as usize) << 8)
@ -298,6 +299,20 @@ fn extract_programs(module: &mut Module) -> Result<Vec<shared::Program>, Error>
| ((payload[3] as usize) << 24); | ((payload[3] as usize) << 24);
let (a, b) = payload[4..].split_at(len as usize); let (a, b) = payload[4..].split_at(len as usize);
payload = b; payload = b;
// Due to a nasty LLVM bug it's currently possible for LLVM to
// duplicate custom section directives in intermediate object files.
// This means that we could see multiple program directives when in
// fact we were originally only meant to see one!
//
// Work around the issue here until the upstream bug,
// https://bugs.llvm.org/show_bug.cgi?id=38184, is hopefully fixed
// via some other means.
if added_programs.iter().any(|p| a == *p) {
continue
}
added_programs.push(a);
let p: shared::ProgramOnlySchema = match serde_json::from_slice(&a) { let p: shared::ProgramOnlySchema = match serde_json::from_slice(&a) {
Ok(f) => f, Ok(f) => f,
Err(e) => bail!("failed to decode what looked like wasm-bindgen data: {}", e), Err(e) => bail!("failed to decode what looked like wasm-bindgen data: {}", e),