summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2017-10-24 20:36:28 -0700
committerGitHub <noreply@github.com>2017-10-24 20:36:28 -0700
commit47c9021401a69d407a3e730012824cae75dd66f9 (patch)
treef03c6077a08f5eb404f31ca415c121415f35934c /src
parent93f5f167d7674e87f634eca1f5980baee4de5053 (diff)
downloadbinaryen-47c9021401a69d407a3e730012824cae75dd66f9.tar.gz
binaryen-47c9021401a69d407a3e730012824cae75dd66f9.tar.bz2
binaryen-47c9021401a69d407a3e730012824cae75dd66f9.zip
notation change: AST => IR (#1245)
The IR is indeed a tree, but not an "abstract syntax tree" since there is no language for which it is the syntax (except in the most trivial and meaningless sense).
Diffstat (limited to 'src')
-rw-r--r--src/asm2wasm.h10
-rw-r--r--src/binaryen-c.cpp2
-rw-r--r--src/cfg/Relooper.cpp2
-rw-r--r--src/ir/CMakeLists.txt (renamed from src/ast/CMakeLists.txt)4
-rw-r--r--src/ir/ExpressionAnalyzer.cpp (renamed from src/ast/ExpressionAnalyzer.cpp)4
-rw-r--r--src/ir/ExpressionManipulator.cpp (renamed from src/ast/ExpressionManipulator.cpp)2
-rw-r--r--src/ir/LocalGraph.cpp (renamed from src/ast/LocalGraph.cpp)4
-rw-r--r--src/ir/bits.h (renamed from src/ast/bits.h)8
-rw-r--r--src/ir/block-utils.h (renamed from src/ast/block-utils.h)10
-rw-r--r--src/ir/branch-utils.h (renamed from src/ast/branch-utils.h)6
-rw-r--r--src/ir/cost.h (renamed from src/ast/cost.h)6
-rw-r--r--src/ir/count.h (renamed from src/ast/count.h)6
-rw-r--r--src/ir/effects.h (renamed from src/ast/effects.h)6
-rw-r--r--src/ir/find_all.h (renamed from src/ast/find_all.h)6
-rw-r--r--src/ir/global-utils.h (renamed from src/ast/global-utils.h)6
-rw-r--r--src/ir/hashed.h (renamed from src/ast/hashed.h)6
-rw-r--r--src/ir/import-utils.h (renamed from src/ast/import-utils.h)6
-rw-r--r--src/ir/label-utils.h (renamed from src/ast/label-utils.h)6
-rw-r--r--src/ir/literal-utils.h (renamed from src/ast/literal-utils.h)6
-rw-r--r--src/ir/load-utils.h (renamed from src/ast/load-utils.h)6
-rw-r--r--src/ir/local-graph.h (renamed from src/ast/local-graph.h)6
-rw-r--r--src/ir/localize.h (renamed from src/ast/localize.h)6
-rw-r--r--src/ir/manipulation.h (renamed from src/ast/manipulation.h)6
-rw-r--r--src/ir/memory-utils.h (renamed from src/ast/memory-utils.h)6
-rw-r--r--src/ir/module-utils.h (renamed from src/ast/module-utils.h)6
-rw-r--r--src/ir/properties.h (renamed from src/ast/properties.h)8
-rw-r--r--src/ir/trapping.h (renamed from src/ast/trapping.h)6
-rw-r--r--src/ir/type-updating.h (renamed from src/ast/type-updating.h)6
-rw-r--r--src/ir/utils.h (renamed from src/ast_utils.h)8
-rw-r--r--src/passes/CoalesceLocals.cpp2
-rw-r--r--src/passes/CodeFolding.cpp6
-rw-r--r--src/passes/CodePushing.cpp2
-rw-r--r--src/passes/DeadCodeElimination.cpp6
-rw-r--r--src/passes/DuplicateFunctionElimination.cpp2
-rw-r--r--src/passes/Flatten.cpp4
-rw-r--r--src/passes/Inlining.cpp4
-rw-r--r--src/passes/LegalizeJSInterface.cpp4
-rw-r--r--src/passes/LocalCSE.cpp4
-rw-r--r--src/passes/MergeBlocks.cpp4
-rw-r--r--src/passes/NameList.cpp2
-rw-r--r--src/passes/OptimizeInstructions.cpp14
-rw-r--r--src/passes/PickLoadSigns.cpp2
-rw-r--r--src/passes/PostEmscripten.cpp2
-rw-r--r--src/passes/Precompute.cpp8
-rw-r--r--src/passes/Print.cpp2
-rw-r--r--src/passes/PrintCallGraph.cpp3
-rw-r--r--src/passes/ReReloop.cpp2
-rw-r--r--src/passes/RelooperJumpThreading.cpp4
-rw-r--r--src/passes/RemoveUnusedBrs.cpp6
-rw-r--r--src/passes/RemoveUnusedModuleElements.cpp2
-rw-r--r--src/passes/SSAify.cpp4
-rw-r--r--src/passes/SafeHeap.cpp4
-rw-r--r--src/passes/SimplifyLocals.cpp8
-rw-r--r--src/passes/TrapMode.cpp2
-rw-r--r--src/passes/Vacuum.cpp6
-rw-r--r--src/tools/asm2wasm.cpp2
-rw-r--r--src/tools/s2wasm.cpp2
-rw-r--r--src/tools/translate-to-fuzz.h2
-rw-r--r--src/tools/wasm-ctor-eval.cpp8
-rw-r--r--src/tools/wasm-reduce.cpp2
-rw-r--r--src/wasm-builder.h2
-rw-r--r--src/wasm-linker.cpp2
-rw-r--r--src/wasm/wasm-binary.cpp4
-rw-r--r--src/wasm/wasm-s-parser.cpp2
-rw-r--r--src/wasm/wasm-validator.cpp4
-rw-r--r--src/wasm/wasm.cpp2
-rw-r--r--src/wasm2asm.h2
67 files changed, 157 insertions, 156 deletions
diff --git a/src/asm2wasm.h b/src/asm2wasm.h
index 9a4305f6a..c02376963 100644
--- a/src/asm2wasm.h
+++ b/src/asm2wasm.h
@@ -31,11 +31,11 @@
#include "passes/passes.h"
#include "pass.h"
#include "parsing.h"
-#include "ast_utils.h"
-#include "ast/bits.h"
-#include "ast/branch-utils.h"
-#include "ast/literal-utils.h"
-#include "ast/trapping.h"
+#include "ir/bits.h"
+#include "ir/branch-utils.h"
+#include "ir/literal-utils.h"
+#include "ir/trapping.h"
+#include "ir/utils.h"
#include "wasm-builder.h"
#include "wasm-emscripten.h"
#include "wasm-module-building.h"
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
index 038431782..15635c940 100644
--- a/src/binaryen-c.cpp
+++ b/src/binaryen-c.cpp
@@ -31,7 +31,7 @@
#include "wasm-validator.h"
#include "wasm2asm.h"
#include "cfg/Relooper.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "shell-interface.h"
using namespace wasm;
diff --git a/src/cfg/Relooper.cpp b/src/cfg/Relooper.cpp
index b326d761d..22b455aaf 100644
--- a/src/cfg/Relooper.cpp
+++ b/src/cfg/Relooper.cpp
@@ -23,7 +23,7 @@
#include <stack>
#include <string>
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "parsing.h"
namespace CFG {
diff --git a/src/ast/CMakeLists.txt b/src/ir/CMakeLists.txt
index c01deaaaf..607207968 100644
--- a/src/ast/CMakeLists.txt
+++ b/src/ir/CMakeLists.txt
@@ -1,6 +1,6 @@
-SET(ast_SOURCES
+SET(ir_SOURCES
ExpressionAnalyzer.cpp
ExpressionManipulator.cpp
LocalGraph.cpp
)
-ADD_LIBRARY(ast STATIC ${ast_SOURCES})
+ADD_LIBRARY(ir STATIC ${ir_SOURCES})
diff --git a/src/ast/ExpressionAnalyzer.cpp b/src/ir/ExpressionAnalyzer.cpp
index d223bf213..05450d567 100644
--- a/src/ast/ExpressionAnalyzer.cpp
+++ b/src/ir/ExpressionAnalyzer.cpp
@@ -15,8 +15,8 @@
*/
#include "support/hash.h"
-#include "ast_utils.h"
-#include "ast/load-utils.h"
+#include "ir/utils.h"
+#include "ir/load-utils.h"
namespace wasm {
// Given a stack of expressions, checks if the topmost is used as a result.
diff --git a/src/ast/ExpressionManipulator.cpp b/src/ir/ExpressionManipulator.cpp
index 6cb0219c5..aa2a10388 100644
--- a/src/ast/ExpressionManipulator.cpp
+++ b/src/ir/ExpressionManipulator.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "support/hash.h"
namespace wasm {
diff --git a/src/ast/LocalGraph.cpp b/src/ir/LocalGraph.cpp
index 0d36fec84..cee187c6d 100644
--- a/src/ast/LocalGraph.cpp
+++ b/src/ir/LocalGraph.cpp
@@ -18,8 +18,8 @@
#include <wasm-builder.h>
#include <wasm-printing.h>
-#include <ast/find_all.h>
-#include <ast/local-graph.h>
+#include <ir/find_all.h>
+#include <ir/local-graph.h>
namespace wasm {
diff --git a/src/ast/bits.h b/src/ir/bits.h
index 7a86e70f4..4196b74c1 100644
--- a/src/ast/bits.h
+++ b/src/ir/bits.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef wasm_ast_bits_h
-#define wasm_ast_bits_h
+#ifndef wasm_ir_bits_h
+#define wasm_ir_bits_h
#include "support/bits.h"
#include "wasm-builder.h"
-#include "ast/literal-utils.h"
+#include "ir/literal-utils.h"
namespace wasm {
@@ -103,5 +103,5 @@ struct Bits {
} // namespace wasm
-#endif // wasm_ast_bits_h
+#endif // wasm_ir_bits_h
diff --git a/src/ast/block-utils.h b/src/ir/block-utils.h
index 56c11f240..f7c68aa39 100644
--- a/src/ast/block-utils.h
+++ b/src/ir/block-utils.h
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#ifndef wasm_ast_block_h
-#define wasm_ast_block_h
+#ifndef wasm_ir_block_h
+#define wasm_ir_block_h
#include "literal.h"
#include "wasm.h"
-#include "ast/branch-utils.h"
-#include "ast/effects.h"
+#include "ir/branch-utils.h"
+#include "ir/effects.h"
namespace wasm {
@@ -63,5 +63,5 @@ namespace BlockUtils {
} // namespace wasm
-#endif // wasm_ast_block_h
+#endif // wasm_ir_block_h
diff --git a/src/ast/branch-utils.h b/src/ir/branch-utils.h
index d574945ef..26e8e7c87 100644
--- a/src/ast/branch-utils.h
+++ b/src/ir/branch-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_branch_h
-#define wasm_ast_branch_h
+#ifndef wasm_ir_branch_h
+#define wasm_ir_branch_h
#include "wasm.h"
#include "wasm-traversal.h"
@@ -179,5 +179,5 @@ struct BranchSeeker : public PostWalker<BranchSeeker> {
} // namespace wasm
-#endif // wasm_ast_branch_h
+#endif // wasm_ir_branch_h
diff --git a/src/ast/cost.h b/src/ir/cost.h
index 56050b189..9a97574f4 100644
--- a/src/ast/cost.h
+++ b/src/ir/cost.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_cost_h
-#define wasm_ast_cost_h
+#ifndef wasm_ir_cost_h
+#define wasm_ir_cost_h
namespace wasm {
@@ -251,5 +251,5 @@ struct CostAnalyzer : public Visitor<CostAnalyzer, Index> {
} // namespace wasm
-#endif // wasm_ast_cost_h
+#endif // wasm_ir_cost_h
diff --git a/src/ast/count.h b/src/ir/count.h
index 098df9e27..1fef3a870 100644
--- a/src/ast/count.h
+++ b/src/ir/count.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_count_h
-#define wasm_ast_count_h
+#ifndef wasm_ir_count_h
+#define wasm_ir_count_h
namespace wasm {
@@ -46,5 +46,5 @@ struct GetLocalCounter : public PostWalker<GetLocalCounter> {
} // namespace wasm
-#endif // wasm_ast_count_h
+#endif // wasm_ir_count_h
diff --git a/src/ast/effects.h b/src/ir/effects.h
index 1ae27d2a7..98911d451 100644
--- a/src/ast/effects.h
+++ b/src/ir/effects.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_effects_h
-#define wasm_ast_effects_h
+#ifndef wasm_ir_effects_h
+#define wasm_ir_effects_h
namespace wasm {
@@ -275,4 +275,4 @@ struct EffectAnalyzer : public PostWalker<EffectAnalyzer> {
} // namespace wasm
-#endif // wasm_ast_effects_h
+#endif // wasm_ir_effects_h
diff --git a/src/ast/find_all.h b/src/ir/find_all.h
index 98fe4c5a7..83c751666 100644
--- a/src/ast/find_all.h
+++ b/src/ir/find_all.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_find_all_h
-#define wasm_ast_find_all_h
+#ifndef wasm_ir_find_all_h
+#define wasm_ir_find_all_h
#include <wasm-traversal.h>
@@ -44,5 +44,5 @@ struct FindAll {
} // namespace wasm
-#endif // wasm_ast_find_all_h
+#endif // wasm_ir_find_all_h
diff --git a/src/ast/global-utils.h b/src/ir/global-utils.h
index 96fec282b..bcf0dae72 100644
--- a/src/ast/global-utils.h
+++ b/src/ir/global-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_global_h
-#define wasm_ast_global_h
+#ifndef wasm_ir_global_h
+#define wasm_ir_global_h
#include <algorithm>
#include <vector>
@@ -51,5 +51,5 @@ namespace GlobalUtils {
} // namespace wasm
-#endif // wasm_ast_global_h
+#endif // wasm_ir_global_h
diff --git a/src/ast/hashed.h b/src/ir/hashed.h
index 04ee7f401..dc4012455 100644
--- a/src/ast/hashed.h
+++ b/src/ir/hashed.h
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef _wasm_ast_hashed_h
+#ifndef _wasm_ir_hashed_h
#include "support/hash.h"
#include "wasm.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
namespace wasm {
@@ -55,5 +55,5 @@ class HashedExpressionMap : public std::unordered_map<HashedExpression, T, Expre
} // namespace wasm
-#endif // _wasm_ast_hashed_h
+#endif // _wasm_ir_hashed_h
diff --git a/src/ast/import-utils.h b/src/ir/import-utils.h
index ff7ca3b83..f3f01c266 100644
--- a/src/ast/import-utils.h
+++ b/src/ir/import-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_import_h
-#define wasm_ast_import_h
+#ifndef wasm_ir_import_h
+#define wasm_ir_import_h
#include "literal.h"
#include "wasm.h"
@@ -37,5 +37,5 @@ namespace ImportUtils {
} // namespace wasm
-#endif // wasm_ast_import_h
+#endif // wasm_ir_import_h
diff --git a/src/ast/label-utils.h b/src/ir/label-utils.h
index 6ec9ecf5d..f4fb77697 100644
--- a/src/ast/label-utils.h
+++ b/src/ir/label-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_label_h
-#define wasm_ast_label_h
+#ifndef wasm_ir_label_h
+#define wasm_ir_label_h
#include "wasm.h"
#include "wasm-traversal.h"
@@ -58,5 +58,5 @@ private:
} // namespace wasm
-#endif // wasm_ast_label_h
+#endif // wasm_ir_label_h
diff --git a/src/ast/literal-utils.h b/src/ir/literal-utils.h
index afa8146b9..a702c52eb 100644
--- a/src/ast/literal-utils.h
+++ b/src/ir/literal-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_literl_utils_h
-#define wasm_ast_literl_utils_h
+#ifndef wasm_ir_literal_utils_h
+#define wasm_ir_literal_utils_h
#include "wasm.h"
@@ -52,5 +52,5 @@ inline Expression* makeZero(WasmType type, Module& wasm) {
} // namespace wasm
-#endif // wasm_ast_literl_utils_h
+#endif // wasm_ir_literal_utils_h
diff --git a/src/ast/load-utils.h b/src/ir/load-utils.h
index d5817ff51..edc7eb90f 100644
--- a/src/ast/load-utils.h
+++ b/src/ir/load-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_load_h
-#define wasm_ast_load_h
+#ifndef wasm_ir_load_h
+#define wasm_ir_load_h
#include "wasm.h"
@@ -36,5 +36,5 @@ inline bool isSignRelevant(Load* load) {
} // namespace wasm
-#endif // wasm_ast_load_h
+#endif // wasm_ir_load_h
diff --git a/src/ast/local-graph.h b/src/ir/local-graph.h
index 03915da5e..4c4c1ee0a 100644
--- a/src/ast/local-graph.h
+++ b/src/ir/local-graph.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_local_graph_h
-#define wasm_ast_local_graph_h
+#ifndef wasm_ir_local_graph_h
+#define wasm_ir_local_graph_h
namespace wasm {
@@ -107,5 +107,5 @@ public:
} // namespace wasm
-#endif // wasm_ast_local_graph_h
+#endif // wasm_ir_local_graph_h
diff --git a/src/ast/localize.h b/src/ir/localize.h
index 9e7dd6653..c910d9f9b 100644
--- a/src/ast/localize.h
+++ b/src/ir/localize.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_localizer_h
-#define wasm_ast_localizer_h
+#ifndef wasm_ir_localizer_h
+#define wasm_ir_localizer_h
#include <wasm-builder.h>
@@ -43,5 +43,5 @@ struct Localizer {
} // namespace wasm
-#endif // wasm_ast_localizer_h
+#endif // wasm_ir_localizer_h
diff --git a/src/ast/manipulation.h b/src/ir/manipulation.h
index 29b6a346d..57188ad68 100644
--- a/src/ast/manipulation.h
+++ b/src/ir/manipulation.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_manipulation_h
-#define wasm_ast_manipulation_h
+#ifndef wasm_ir_manipulation_h
+#define wasm_ir_manipulation_h
#include "wasm.h"
@@ -65,5 +65,5 @@ namespace ExpressionManipulator {
} // wasm
-#endif // wams_ast_manipulation_h
+#endif // wams_ir_manipulation_h
diff --git a/src/ast/memory-utils.h b/src/ir/memory-utils.h
index dfb33837d..920583f7d 100644
--- a/src/ast/memory-utils.h
+++ b/src/ir/memory-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_memory_h
-#define wasm_ast_memory_h
+#ifndef wasm_ir_memory_h
+#define wasm_ir_memory_h
#include <algorithm>
#include <vector>
@@ -52,5 +52,5 @@ namespace MemoryUtils {
} // namespace wasm
-#endif // wasm_ast_memory_h
+#endif // wasm_ir_memory_h
diff --git a/src/ast/module-utils.h b/src/ir/module-utils.h
index 11a5a3530..0c828f83a 100644
--- a/src/ast/module-utils.h
+++ b/src/ir/module-utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_module_h
-#define wasm_ast_module_h
+#ifndef wasm_ir_module_h
+#define wasm_ir_module_h
#include "wasm.h"
@@ -55,5 +55,5 @@ struct BinaryIndexes {
} // namespace wasm
-#endif // wasm_ast_module_h
+#endif // wasm_ir_module_h
diff --git a/src/ast/properties.h b/src/ir/properties.h
index 8c8655c07..cf481218c 100644
--- a/src/ast/properties.h
+++ b/src/ir/properties.h
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef wasm_ast_properties_h
-#define wasm_ast_properties_h
+#ifndef wasm_ir_properties_h
+#define wasm_ir_properties_h
#include "wasm.h"
-#include "ast/bits.h"
+#include "ir/bits.h"
namespace wasm {
@@ -137,5 +137,5 @@ struct Properties {
} // wasm
-#endif // wams_ast_properties_h
+#endif // wams_ir_properties_h
diff --git a/src/ast/trapping.h b/src/ir/trapping.h
index 7b170ccb4..a3a87f8ef 100644
--- a/src/ast/trapping.h
+++ b/src/ir/trapping.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_trapping_h
-#define wasm_ast_trapping_h
+#ifndef wasm_ir_trapping_h
+#define wasm_ir_trapping_h
#include <exception>
@@ -117,4 +117,4 @@ inline TrapMode trapModeFromString(std::string const& str) {
} // wasm
-#endif // wasm_ast_trapping_h
+#endif // wasm_ir_trapping_h
diff --git a/src/ast/type-updating.h b/src/ir/type-updating.h
index c5f1d5344..79b26aa43 100644
--- a/src/ast/type-updating.h
+++ b/src/ir/type-updating.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef wasm_ast_type_updating_h
-#define wasm_ast_type_updating_h
+#ifndef wasm_ir_type_updating_h
+#define wasm_ir_type_updating_h
#include "wasm-traversal.h"
@@ -283,4 +283,4 @@ struct TypeUpdater : public ExpressionStackWalker<TypeUpdater, UnifiedExpression
} // namespace wasm
-#endif // wasm_ast_type_updating_h
+#endif // wasm_ir_type_updating_h
diff --git a/src/ast_utils.h b/src/ir/utils.h
index 4a8d9ff80..786e04e45 100644
--- a/src/ast_utils.h
+++ b/src/ir/utils.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef wasm_ast_utils_h
-#define wasm_ast_utils_h
+#ifndef wasm_ir_utils_h
+#define wasm_ir_utils_h
#include "wasm.h"
#include "wasm-traversal.h"
#include "wasm-builder.h"
#include "pass.h"
-#include "ast/branch-utils.h"
+#include "ir/branch-utils.h"
namespace wasm {
@@ -357,4 +357,4 @@ struct I64Utilities {
} // namespace wasm
-#endif // wasm_ast_utils_h
+#endif // wasm_ir_utils_h
diff --git a/src/passes/CoalesceLocals.cpp b/src/passes/CoalesceLocals.cpp
index af25f3fbe..36c963b08 100644
--- a/src/passes/CoalesceLocals.cpp
+++ b/src/passes/CoalesceLocals.cpp
@@ -28,7 +28,7 @@
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "cfg/cfg-traversal.h"
#include "wasm-builder.h"
#include "support/learning.h"
diff --git a/src/passes/CodeFolding.cpp b/src/passes/CodeFolding.cpp
index 105232676..415cf38de 100644
--- a/src/passes/CodeFolding.cpp
+++ b/src/passes/CodeFolding.cpp
@@ -59,9 +59,9 @@
#include "wasm.h"
#include "pass.h"
#include "wasm-builder.h"
-#include "ast_utils.h"
-#include "ast/branch-utils.h"
-#include "ast/label-utils.h"
+#include "ir/utils.h"
+#include "ir/branch-utils.h"
+#include "ir/label-utils.h"
namespace wasm {
diff --git a/src/passes/CodePushing.cpp b/src/passes/CodePushing.cpp
index e73794f5a..fefceb6ec 100644
--- a/src/passes/CodePushing.cpp
+++ b/src/passes/CodePushing.cpp
@@ -22,7 +22,7 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast/effects.h>
+#include <ir/effects.h>
namespace wasm {
diff --git a/src/passes/DeadCodeElimination.cpp b/src/passes/DeadCodeElimination.cpp
index 5c0cfc291..97c63baf5 100644
--- a/src/passes/DeadCodeElimination.cpp
+++ b/src/passes/DeadCodeElimination.cpp
@@ -32,9 +32,9 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast/block-utils.h>
-#include <ast/branch-utils.h>
-#include <ast/type-updating.h>
+#include <ir/block-utils.h>
+#include <ir/branch-utils.h>
+#include <ir/type-updating.h>
namespace wasm {
diff --git a/src/passes/DuplicateFunctionElimination.cpp b/src/passes/DuplicateFunctionElimination.cpp
index a96bd8fdf..c7852237b 100644
--- a/src/passes/DuplicateFunctionElimination.cpp
+++ b/src/passes/DuplicateFunctionElimination.cpp
@@ -22,7 +22,7 @@
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "support/hash.h"
namespace wasm {
diff --git a/src/passes/Flatten.cpp b/src/passes/Flatten.cpp
index b16d9df3f..00130838e 100644
--- a/src/passes/Flatten.cpp
+++ b/src/passes/Flatten.cpp
@@ -51,8 +51,8 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast_utils.h>
-#include <ast/effects.h>
+#include <ir/utils.h>
+#include <ir/effects.h>
namespace wasm {
diff --git a/src/passes/Inlining.cpp b/src/passes/Inlining.cpp
index e5fdcbb9d..b3e111e5a 100644
--- a/src/passes/Inlining.cpp
+++ b/src/passes/Inlining.cpp
@@ -32,8 +32,8 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast_utils.h>
-#include <ast/literal-utils.h>
+#include <ir/utils.h>
+#include <ir/literal-utils.h>
#include <parsing.h>
namespace wasm {
diff --git a/src/passes/LegalizeJSInterface.cpp b/src/passes/LegalizeJSInterface.cpp
index cbd34e407..7f6ee6b48 100644
--- a/src/passes/LegalizeJSInterface.cpp
+++ b/src/passes/LegalizeJSInterface.cpp
@@ -29,8 +29,8 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast_utils.h>
-#include <ast/literal-utils.h>
+#include <ir/utils.h>
+#include <ir/literal-utils.h>
namespace wasm {
diff --git a/src/passes/LocalCSE.cpp b/src/passes/LocalCSE.cpp
index 609caf43a..7b27e06d3 100644
--- a/src/passes/LocalCSE.cpp
+++ b/src/passes/LocalCSE.cpp
@@ -29,8 +29,8 @@
#include <wasm-builder.h>
#include <wasm-traversal.h>
#include <pass.h>
-#include <ast/effects.h>
-#include <ast/hashed.h>
+#include <ir/effects.h>
+#include <ir/hashed.h>
namespace wasm {
diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
index 619d7b5a5..798ad927f 100644
--- a/src/passes/MergeBlocks.cpp
+++ b/src/passes/MergeBlocks.cpp
@@ -64,8 +64,8 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast_utils.h>
-#include <ast/effects.h>
+#include <ir/utils.h>
+#include <ir/effects.h>
namespace wasm {
diff --git a/src/passes/NameList.cpp b/src/passes/NameList.cpp
index 85bac62e9..ebc3a5c55 100644
--- a/src/passes/NameList.cpp
+++ b/src/passes/NameList.cpp
@@ -20,7 +20,7 @@
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
namespace wasm {
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
index ada95aee6..5194c8ce7 100644
--- a/src/passes/OptimizeInstructions.cpp
+++ b/src/passes/OptimizeInstructions.cpp
@@ -24,13 +24,13 @@
#include <pass.h>
#include <wasm-s-parser.h>
#include <support/threads.h>
-#include <ast_utils.h>
-#include <ast/cost.h>
-#include <ast/effects.h>
-#include <ast/manipulation.h>
-#include <ast/properties.h>
-#include <ast/literal-utils.h>
-#include <ast/load-utils.h>
+#include <ir/utils.h>
+#include <ir/cost.h>
+#include <ir/effects.h>
+#include <ir/manipulation.h>
+#include <ir/properties.h>
+#include <ir/literal-utils.h>
+#include <ir/load-utils.h>
// TODO: Use the new sign-extension opcodes where appropriate. This needs to be conditionalized on the availability of atomics.
diff --git a/src/passes/PickLoadSigns.cpp b/src/passes/PickLoadSigns.cpp
index d7947960c..827346839 100644
--- a/src/passes/PickLoadSigns.cpp
+++ b/src/passes/PickLoadSigns.cpp
@@ -16,7 +16,7 @@
#include <wasm.h>
#include <pass.h>
-#include <ast/properties.h>
+#include <ir/properties.h>
namespace wasm {
diff --git a/src/passes/PostEmscripten.cpp b/src/passes/PostEmscripten.cpp
index 937a70e36..a7f0e6282 100644
--- a/src/passes/PostEmscripten.cpp
+++ b/src/passes/PostEmscripten.cpp
@@ -22,7 +22,7 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast/localize.h>
+#include <ir/localize.h>
#include <asmjs/shared-constants.h>
namespace wasm {
diff --git a/src/passes/Precompute.cpp b/src/passes/Precompute.cpp
index d2a7d0b9a..f4c20d0d0 100644
--- a/src/passes/Precompute.cpp
+++ b/src/passes/Precompute.cpp
@@ -22,10 +22,10 @@
#include <pass.h>
#include <wasm-builder.h>
#include <wasm-interpreter.h>
-#include <ast_utils.h>
-#include <ast/literal-utils.h>
-#include <ast/local-graph.h>
-#include <ast/manipulation.h>
+#include <ir/utils.h>
+#include <ir/literal-utils.h>
+#include <ir/local-graph.h>
+#include <ir/manipulation.h>
namespace wasm {
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index beae693d9..ed868deb6 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -22,7 +22,7 @@
#include <wasm-printing.h>
#include <pass.h>
#include <pretty_printing.h>
-#include <ast/module-utils.h>
+#include <ir/module-utils.h>
namespace wasm {
diff --git a/src/passes/PrintCallGraph.cpp b/src/passes/PrintCallGraph.cpp
index 30a33e9ad..ac11dfb8b 100644
--- a/src/passes/PrintCallGraph.cpp
+++ b/src/passes/PrintCallGraph.cpp
@@ -21,9 +21,10 @@
#include <memory>
#include <iomanip>
+
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
namespace wasm {
diff --git a/src/passes/ReReloop.cpp b/src/passes/ReReloop.cpp
index c36363ba9..99e60a72f 100644
--- a/src/passes/ReReloop.cpp
+++ b/src/passes/ReReloop.cpp
@@ -28,7 +28,7 @@
#include "wasm-traversal.h"
#include "pass.h"
#include "cfg/Relooper.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#ifdef RERELOOP_DEBUG
#include <wasm-printing.h>
diff --git a/src/passes/RelooperJumpThreading.cpp b/src/passes/RelooperJumpThreading.cpp
index ad7582fb4..db865d1bb 100644
--- a/src/passes/RelooperJumpThreading.cpp
+++ b/src/passes/RelooperJumpThreading.cpp
@@ -21,8 +21,8 @@
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
-#include "ast/manipulation.h"
+#include "ir/utils.h"
+#include "ir/manipulation.h"
namespace wasm {
diff --git a/src/passes/RemoveUnusedBrs.cpp b/src/passes/RemoveUnusedBrs.cpp
index d2cdec7ad..33ffc42b6 100644
--- a/src/passes/RemoveUnusedBrs.cpp
+++ b/src/passes/RemoveUnusedBrs.cpp
@@ -20,9 +20,9 @@
#include <wasm.h>
#include <pass.h>
-#include <ast_utils.h>
-#include <ast/branch-utils.h>
-#include <ast/effects.h>
+#include <ir/utils.h>
+#include <ir/branch-utils.h>
+#include <ir/effects.h>
#include <wasm-builder.h>
namespace wasm {
diff --git a/src/passes/RemoveUnusedModuleElements.cpp b/src/passes/RemoveUnusedModuleElements.cpp
index d9f6a7978..8bf2f9c9a 100644
--- a/src/passes/RemoveUnusedModuleElements.cpp
+++ b/src/passes/RemoveUnusedModuleElements.cpp
@@ -25,7 +25,7 @@
#include "wasm.h"
#include "pass.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "asm_v_wasm.h"
namespace wasm {
diff --git a/src/passes/SSAify.cpp b/src/passes/SSAify.cpp
index aafea8a97..fd274e28d 100644
--- a/src/passes/SSAify.cpp
+++ b/src/passes/SSAify.cpp
@@ -34,8 +34,8 @@
#include "pass.h"
#include "wasm-builder.h"
#include "support/permutations.h"
-#include "ast/literal-utils.h"
-#include "ast/local-graph.h"
+#include "ir/literal-utils.h"
+#include "ir/local-graph.h"
namespace wasm {
diff --git a/src/passes/SafeHeap.cpp b/src/passes/SafeHeap.cpp
index 046f86857..3349f983a 100644
--- a/src/passes/SafeHeap.cpp
+++ b/src/passes/SafeHeap.cpp
@@ -25,8 +25,8 @@
#include "asm_v_wasm.h"
#include "asmjs/shared-constants.h"
#include "wasm-builder.h"
-#include "ast/bits.h"
-#include "ast/import-utils.h"
+#include "ir/bits.h"
+#include "ir/import-utils.h"
namespace wasm {
diff --git a/src/passes/SimplifyLocals.cpp b/src/passes/SimplifyLocals.cpp
index cf64517b7..f6997d14e 100644
--- a/src/passes/SimplifyLocals.cpp
+++ b/src/passes/SimplifyLocals.cpp
@@ -45,10 +45,10 @@
#include <wasm-builder.h>
#include <wasm-traversal.h>
#include <pass.h>
-#include <ast/count.h>
-#include <ast/effects.h>
-#include <ast/find_all.h>
-#include <ast/manipulation.h>
+#include <ir/count.h>
+#include <ir/effects.h>
+#include <ir/find_all.h>
+#include <ir/manipulation.h>
namespace wasm {
diff --git a/src/passes/TrapMode.cpp b/src/passes/TrapMode.cpp
index 2cb7b2f6b..727d61102 100644
--- a/src/passes/TrapMode.cpp
+++ b/src/passes/TrapMode.cpp
@@ -22,7 +22,7 @@
#include "asm_v_wasm.h"
#include "asmjs/shared-constants.h"
-#include "ast/trapping.h"
+#include "ir/trapping.h"
#include "mixed_arena.h"
#include "pass.h"
#include "wasm.h"
diff --git a/src/passes/Vacuum.cpp b/src/passes/Vacuum.cpp
index ea2377679..4326bbc3b 100644
--- a/src/passes/Vacuum.cpp
+++ b/src/passes/Vacuum.cpp
@@ -21,9 +21,9 @@
#include <wasm.h>
#include <pass.h>
#include <wasm-builder.h>
-#include <ast/block-utils.h>
-#include <ast/effects.h>
-#include <ast/type-updating.h>
+#include <ir/block-utils.h>
+#include <ir/effects.h>
+#include <ir/type-updating.h>
namespace wasm {
diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp
index 3ce140b04..455410cd6 100644
--- a/src/tools/asm2wasm.cpp
+++ b/src/tools/asm2wasm.cpp
@@ -20,7 +20,7 @@
#include <exception>
-#include "ast/trapping.h"
+#include "ir/trapping.h"
#include "support/colors.h"
#include "support/command-line.h"
#include "support/file.h"
diff --git a/src/tools/s2wasm.cpp b/src/tools/s2wasm.cpp
index 2556cf482..37604e74b 100644
--- a/src/tools/s2wasm.cpp
+++ b/src/tools/s2wasm.cpp
@@ -20,7 +20,7 @@
#include <exception>
-#include "ast/trapping.h"
+#include "ir/trapping.h"
#include "support/colors.h"
#include "support/command-line.h"
#include "support/file.h"
diff --git a/src/tools/translate-to-fuzz.h b/src/tools/translate-to-fuzz.h
index 94122c05d..b9aaea397 100644
--- a/src/tools/translate-to-fuzz.h
+++ b/src/tools/translate-to-fuzz.h
@@ -26,7 +26,7 @@ high chance for set at start of loop
*/
#include <wasm-builder.h>
-#include <ast/literal-utils.h>
+#include <ir/literal-utils.h>
namespace wasm {
diff --git a/src/tools/wasm-ctor-eval.cpp b/src/tools/wasm-ctor-eval.cpp
index dc9b15144..631966d40 100644
--- a/src/tools/wasm-ctor-eval.cpp
+++ b/src/tools/wasm-ctor-eval.cpp
@@ -31,10 +31,10 @@
#include "wasm-io.h"
#include "wasm-interpreter.h"
#include "wasm-builder.h"
-#include "ast/memory-utils.h"
-#include "ast/global-utils.h"
-#include "ast/import-utils.h"
-#include "ast/literal-utils.h"
+#include "ir/memory-utils.h"
+#include "ir/global-utils.h"
+#include "ir/import-utils.h"
+#include "ir/literal-utils.h"
using namespace wasm;
diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp
index ff3408b9a..53c197185 100644
--- a/src/tools/wasm-reduce.cpp
+++ b/src/tools/wasm-reduce.cpp
@@ -32,7 +32,7 @@
#include "support/file.h"
#include "wasm-io.h"
#include "wasm-builder.h"
-#include "ast/literal-utils.h"
+#include "ir/literal-utils.h"
#include "wasm-validator.h"
using namespace wasm;
diff --git a/src/wasm-builder.h b/src/wasm-builder.h
index e5ca79845..bc670bb8f 100644
--- a/src/wasm-builder.h
+++ b/src/wasm-builder.h
@@ -18,7 +18,7 @@
#define wasm_wasm_builder_h
#include "wasm.h"
-#include "ast/manipulation.h"
+#include "ir/manipulation.h"
namespace wasm {
diff --git a/src/wasm-linker.cpp b/src/wasm-linker.cpp
index c209d3e16..b2f337d5a 100644
--- a/src/wasm-linker.cpp
+++ b/src/wasm-linker.cpp
@@ -16,7 +16,7 @@
#include "wasm-linker.h"
#include "asm_v_wasm.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "s2wasm.h"
#include "support/utilities.h"
#include "wasm-builder.h"
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index bd0684d28..43eb94601 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -19,8 +19,8 @@
#include "support/bits.h"
#include "wasm-binary.h"
-#include "ast/branch-utils.h"
-#include "ast/module-utils.h"
+#include "ir/branch-utils.h"
+#include "ir/module-utils.h"
namespace wasm {
diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp
index 0e329067e..599eec5b8 100644
--- a/src/wasm/wasm-s-parser.cpp
+++ b/src/wasm/wasm-s-parser.cpp
@@ -22,7 +22,7 @@
#include "asm_v_wasm.h"
#include "asmjs/shared-constants.h"
-#include "ast/branch-utils.h"
+#include "ir/branch-utils.h"
#include "shared-constants.h"
#include "wasm-binary.h"
#include "wasm-builder.h"
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index 5120eea7a..780d74c2d 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -22,8 +22,8 @@
#include "wasm.h"
#include "wasm-printing.h"
#include "wasm-validator.h"
-#include "ast_utils.h"
-#include "ast/branch-utils.h"
+#include "ir/utils.h"
+#include "ir/branch-utils.h"
#include "support/colors.h"
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index 6441991c9..8739d96f7 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -16,7 +16,7 @@
#include "wasm.h"
#include "wasm-traversal.h"
-#include "ast/branch-utils.h"
+#include "ir/branch-utils.h"
namespace wasm {
diff --git a/src/wasm2asm.h b/src/wasm2asm.h
index 028e4d4d5..05896aacd 100644
--- a/src/wasm2asm.h
+++ b/src/wasm2asm.h
@@ -31,7 +31,7 @@
#include "emscripten-optimizer/optimizer.h"
#include "mixed_arena.h"
#include "asm_v_wasm.h"
-#include "ast_utils.h"
+#include "ir/utils.h"
#include "passes/passes.h"
namespace wasm {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-11 16:25:01 +0000