fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-04-25 07:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Add test involving custom section, fix the ensuing bug

Browse Source
This commit is contained in:
Joshua Warner 2018-12-28 18:17:28 -08:00
parent b91a0aa140
commit a39ab02b5c
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/elements/module.rs
View File

@ -245,17 +245,17 @@ impl Module {
/// Changes the module's start section. /// Changes the module's start section.
pub fn set_start_section(&mut self, new_start: u32) { pub fn set_start_section(&mut self, new_start: u32) {
let mut insert_after = 0; for section in self.sections_mut().iter_mut() {
for (i, section) in self.sections_mut().iter_mut().enumerate() {
if let &mut Section::Start(_sect) = section { if let &mut Section::Start(_sect) = section {
*section = Section::Start(new_start); *section = Section::Start(new_start);
return return
} }
if section.id() < 0x8 {
insert_after = i;
} }
} let insert_before = self.sections().iter().enumerate()
self.sections_mut().insert(insert_after + 1, Section::Start(new_start)); .filter_map(|(i, s)| if s.id() > 0x8 { Some(i) } else { None })
.next()
.unwrap_or(0);
self.sections_mut().insert(insert_before, Section::Start(new_start));
} }
/// Removes the module's start section. /// Removes the module's start section.
@ -770,4 +770,19 @@ mod integration_tests {
let sections = module.sections().iter().map(|s| s.id()).collect::<Vec<_>>(); let sections = module.sections().iter().map(|s| s.id()).collect::<Vec<_>>();
assert_eq!(sections, vec![1, 2, 3, 6, 7, 8, 9, 10, 11]); assert_eq!(sections, vec![1, 2, 3, 6, 7, 8, 9, 10, 11]);
} }
#[test]
fn add_start_custom() {
let mut module = deserialize_file("./res/cases/v1/start_add_custom.wasm").expect("failed to deserialize");
let sections = module.sections().iter().map(|s| s.id()).collect::<Vec<_>>();
assert_eq!(sections, vec![1, 2, 3, 6, 7, 9, 10, 11, 0]);
assert!(module.start_section().is_none());
module.set_start_section(0);
assert_eq!(module.start_section().expect("Did not find any start section"), 0);
let sections = module.sections().iter().map(|s| s.id()).collect::<Vec<_>>();
assert_eq!(sections, vec![1, 2, 3, 6, 7, 8, 9, 10, 11, 0]);
}
} }