diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | src/passes/RemoveUnusedNames.cpp | 50 | ||||
| -rw-r--r-- | test/passes/remove-unused-names.txt | 16 | ||||
| -rw-r--r-- | test/passes/remove-unused-names.wast | 9 |
5 files changed, 77 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f4554465..f6550d5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ SET(binaryen-shell_SOURCES src/passes/LowerIfElse.cpp src/passes/NameManager.cpp src/passes/RemoveImports.cpp + src/passes/RemoveUnusedNames.cpp ) ADD_EXECUTABLE(binaryen-shell ${binaryen-shell_SOURCES}) @@ -1,6 +1,6 @@ ./update.py echo "building binaryen shell" -g++ -O2 -std=c++11 src/binaryen-shell.cpp src/pass.cpp src/passes/LowerIfElse.cpp src/passes/NameManager.cpp src/passes/RemoveImports.cpp src/support/colors.cpp -o bin/binaryen-shell -Isrc/ -msse2 -mfpmath=sse # use sse for math, avoid x87, necessarily for proper float rounding on 32-bit +g++ -O2 -std=c++11 src/binaryen-shell.cpp src/pass.cpp src/passes/LowerIfElse.cpp src/passes/NameManager.cpp src/passes/RemoveImports.cpp src/passes/RemoveUnusedNames.cpp src/support/colors.cpp -o bin/binaryen-shell -Isrc/ -msse2 -mfpmath=sse # use sse for math, avoid x87, necessarily for proper float rounding on 32-bit echo "building asm2wasm" g++ -O2 -std=c++11 src/asm2wasm-main.cpp src/emscripten-optimizer/parser.cpp src/emscripten-optimizer/simple_ast.cpp src/emscripten-optimizer/optimizer-shared.cpp src/support/colors.cpp -Isrc/ -o bin/asm2wasm echo "building wasm2asm" diff --git a/src/passes/RemoveUnusedNames.cpp b/src/passes/RemoveUnusedNames.cpp new file mode 100644 index 000000000..9c0b4a83f --- /dev/null +++ b/src/passes/RemoveUnusedNames.cpp @@ -0,0 +1,50 @@ +/* + * Copyright 2015 WebAssembly Community Group participants + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// +// Removes names from locations that are never branched to. +// + +#include <wasm.h> +#include <pass.h> + +namespace wasm { + +struct RemoveUnusedNames : public Pass { + std::set<Name> used; + + void prepare(PassRunner* runner, Module *module) override { + struct Scanner : public WasmWalker { + std::set<Name>& used; + Scanner(std::set<Name>& used) : used(used) {} + void visitBreak(Break *curr) override { + used.insert(curr->name); + } + }; + Scanner scanner(used); + scanner.startWalk(module); + } + + void visitBlock(Block *curr) override { + if (curr->name.is() && used.count(curr->name) == 0) { + curr->name = Name(); + } + } +}; + +static RegisterPass<RemoveUnusedNames> registerPass("remove-unused-names", "removes names from locations that are never branched to"); + +} // namespace wasm diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt new file mode 100644 index 000000000..eef6527e7 --- /dev/null +++ b/test/passes/remove-unused-names.txt @@ -0,0 +1,16 @@ +(module + (memory 16777216 16777216) + (func $b0 (param $i1 i32) (result i32) + (block $topmost + (i32.const 0) + ) + ) +) +(module + (memory 16777216 16777216) + (func $b0 (param $i1 i32) (result i32) + (block + (i32.const 0) + ) + ) +) diff --git a/test/passes/remove-unused-names.wast b/test/passes/remove-unused-names.wast new file mode 100644 index 000000000..ae6b2d31b --- /dev/null +++ b/test/passes/remove-unused-names.wast @@ -0,0 +1,9 @@ +(module + (memory 16777216 16777216) + (func $b0 (param $i1 i32) (result i32) + (block $topmost + (i32.const 0) + ) + ) +) + |