Skip to content

Change optimize() to take in a mutable self #42

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 3 commits into from
Jan 14, 2020
Merged

Change optimize() to take in a mutable self #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7f428d
Add smoke test for optimizer()
axic Dec 31, 2019
840b680
Change optimize() to take in a mutable self
axic Dec 29, 2019
206c5b9
Merge branch 'master' into mut
pepyakin Jan 14, 2020
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
2 changes: 1 addition & 1 deletion examples/wasm_opt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fn main() {
process::exit(1);
}
};
let module = read_module(&args.input_path);
let mut module = read_module(&args.input_path);
binaryen::set_global_codegen_config(&args.codegen_config);
module.optimize();

Expand Down
12 changes: 6 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl Module {
/// Returns `Err` if an invalid module is given.
pub fn read(module: &[u8]) -> Result<Module, ()> {
unsafe {
let raw = ffi::BinaryenModuleSafeRead(module.as_ptr() as *mut c_char, module.len());
let raw = ffi::BinaryenModuleSafeRead(module.as_ptr() as *const c_char, module.len());
if raw.is_null() {
return Err(())
}
Expand All @@ -114,15 +114,15 @@ impl Module {
/// Run the standard optimization passes on the module.
///
/// It will take into account code generation configuration set by `set_global_codegen_config`.
pub fn optimize(&self) {
pub fn optimize(&mut self) {
unsafe { ffi::BinaryenModuleOptimize(self.inner.raw) }
}

/// Run a specified set of optimization passes on the module.
///
/// This WILL NOT take into account code generation configuration set by `set_global_codegen_config`.
pub fn run_optimization_passes<B: AsRef<str>, I: IntoIterator<Item = B>>(
&self,
&mut self,
passes: I,
) -> Result<(), ()> {
let mut cstr_vec: Vec<_> = vec![];
Expand Down Expand Up @@ -213,7 +213,7 @@ mod tests {
)
)
"#;
let module = Module::read(&wat2wasm!(CODE)).unwrap();
let mut module = Module::read(&wat2wasm!(CODE)).unwrap();

assert!(module.is_valid());

Expand All @@ -224,7 +224,7 @@ mod tests {

#[test]
fn test_invalid_optimization_passes() {
let module = Module::new();
let mut module = Module::new();
assert!(module.run_optimization_passes(&["invalid"]).is_err());
}

Expand All @@ -241,7 +241,7 @@ mod tests {
0x0a, 0x05, 0x01, 0x03, 0x00, 0x01, 0x0b,
];

let module = Module::read(&input).unwrap();
let mut module = Module::read(&input).unwrap();
assert!(module.is_valid());
module.optimize();
assert!(module.is_valid());
Expand Down