From d4c0c5babc2a8a941bde84f839c7a4936f0f6df9 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 10 Oct 2017 10:21:06 -0700 Subject: [PATCH] Rename WasmRuntime's `get_name` to `get_func_name`. --- lib/wasm/src/module_translator.rs | 2 +- lib/wasm/src/runtime/dummy.rs | 4 ++-- lib/wasm/src/runtime/spec.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/wasm/src/module_translator.rs b/lib/wasm/src/module_translator.rs index 434f2b0da3..3cbb11de6d 100644 --- a/lib/wasm/src/module_translator.rs +++ b/lib/wasm/src/module_translator.rs @@ -152,7 +152,7 @@ pub fn translate_module( func.signature = runtime .get_signature(runtime.get_func_type(function_index)) .clone(); - func.name = runtime.get_name(function_index); + func.name = runtime.get_func_name(function_index); trans .translate_from_reader(parser.create_binary_reader(), &mut func, runtime) .map_err(|e| String::from(e.description()))?; diff --git a/lib/wasm/src/runtime/dummy.rs b/lib/wasm/src/runtime/dummy.rs index 4ebbdd39d3..5dd39d1871 100644 --- a/lib/wasm/src/runtime/dummy.rs +++ b/lib/wasm/src/runtime/dummy.rs @@ -109,7 +109,7 @@ impl FuncEnvironment for DummyRuntime { // A real implementation would probably add a `vmctx` argument. // And maybe attempt some signature de-duplication. let signature = func.import_signature(self.signatures[sigidx].clone()); - let name = self.get_name(index); + let name = self.get_func_name(index); func.import_function(ir::ExtFuncData { name, signature }) } @@ -146,7 +146,7 @@ impl FuncEnvironment for DummyRuntime { } impl WasmRuntime for DummyRuntime { - fn get_name(&self, func_index: FunctionIndex) -> ir::FunctionName { + fn get_func_name(&self, func_index: FunctionIndex) -> ir::FunctionName { ir::FunctionName::new(format!("wasm_0x{:x}", func_index)) } diff --git a/lib/wasm/src/runtime/spec.rs b/lib/wasm/src/runtime/spec.rs index dc51a20d8e..35c25d3807 100644 --- a/lib/wasm/src/runtime/spec.rs +++ b/lib/wasm/src/runtime/spec.rs @@ -151,7 +151,7 @@ pub trait FuncEnvironment { /// by the user, they are only for `cretonne-wasm` internal use. pub trait WasmRuntime: FuncEnvironment { /// Return the name for the given function index. - fn get_name(&self, func_index: FunctionIndex) -> ir::FunctionName; + fn get_func_name(&self, func_index: FunctionIndex) -> ir::FunctionName; /// Declares a function signature to the runtime. fn declare_signature(&mut self, sig: &ir::Signature);