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).

26 files changed, 55 insertions, 54 deletions

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 {