fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-18 07:21:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in coalescing types with GC

Browse Source 
When a duplicate type is found is should no longer be considered used!
This commit is contained in:
Alex Crichton
2018-10-29 17:20:38 -07:00
parent 31c11f0781
commit 40b68c66d9
4 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/gc/src/bitvec.rs
View File

@ -29,6 +29,15 @@ impl BitSet {
}
}
pub fn remove(&mut self, i: &u32) {
let i = *i as usize;
let idx = i / BITS;
let bit = 1 << (i % BITS);
if let Some(slot) = self.bits.get_mut(idx) {
*slot &= !bit;
}
}
pub fn contains(&self, i: &u32) -> bool {
let i = *i as usize;
let idx = i / BITS;

7
crates/gc/src/lib.rs
View File

@ -51,7 +51,7 @@ impl Config {
}
fn run(config: &mut Config, module: &mut Module) {
let analysis = {
let mut analysis = {
let mut cx = LiveContext::new(&module);
cx.blacklist.insert("rust_eh_personality");
cx.blacklist.insert("__indirect_function_table");
@ -80,7 +80,7 @@ fn run(config: &mut Config, module: &mut Module) {
cx.analysis
};
let cx = RemapContext::new(&module, &analysis, config);
let cx = RemapContext::new(&module, &mut analysis, config);
for i in (0..module.sections().len()).rev() {
let retain = match module.sections_mut()[i] {
Section::Unparsed { .. } => {
@ -476,7 +476,7 @@ struct RemapContext<'a> {
}
impl<'a> RemapContext<'a> {
fn new(m: &Module, analysis: &'a Analysis, config: &'a Config) -> RemapContext<'a> {
fn new(m: &Module, analysis: &'a mut Analysis, config: &'a Config) -> RemapContext<'a> {
let mut nfunctions = 0;
let mut functions = Vec::new();
let mut nglobals = 0;
@ -494,6 +494,7 @@ impl<'a> RemapContext<'a> {
if analysis.types.contains(&(i as u32)) {
if let Some(prev) = map.get(&ty) {
types.push(*prev);
analysis.types.remove(&(i as u32));
continue
}
map.insert(ty, ntypes);