Add a Control construct and re-engineer closure conversion

src/thorin/CMakeLists.txt

@@ -16,12 +16,8 @@ set(THORIN_SOURCES
     world.h
     analyses/cfg.cpp
     analyses/cfg.h
-    analyses/domfrontier.cpp
-    analyses/domfrontier.h
     analyses/domtree.cpp
     analyses/domtree.h
-    analyses/free_defs.cpp
-    analyses/free_defs.h
     analyses/looptree.cpp
     analyses/looptree.h
     analyses/schedule.cpp
@@ -43,15 +39,10 @@ set(THORIN_SOURCES
     tables/primtypetable.h
     tables/mathoptable.h
     transform/cleanup_world.cpp
-    transform/cleanup_world.h
-    transform/clone_bodies.cpp
-    transform/clone_bodies.h
     transform/closure_conversion.cpp
     transform/closure_conversion.h
     transform/codegen_prepare.h
     transform/codegen_prepare.cpp
-    transform/dead_load_opt.cpp
-    transform/dead_load_opt.h
     transform/hoist_enters.cpp
     transform/hoist_enters.h
     transform/flatten_tuples.cpp
@@ -60,20 +51,28 @@ set(THORIN_SOURCES
     transform/importer.h
     transform/inliner.cpp
     transform/inliner.h
-    transform/lift_builtins.cpp
-    transform/lift_builtins.h
+    transform/insert_pipeline_continue.cpp
+    transform/insert_pipeline_continue.h
     transform/mangle.cpp
     transform/mangle.h
     transform/resolve_loads.cpp
     transform/resolve_loads.h
     transform/partial_evaluation.cpp
     transform/partial_evaluation.h
+    transform/rewrite.cpp
+    transform/rewrite.h
     transform/split_slots.cpp
     transform/split_slots.h
     transform/hls_channels.cpp
     transform/hls_channels.h
     transform/hls_kernel_launch.h
     transform/hls_kernel_launch.cpp
+    transform/lower_control.h
+    transform/lower_control.cpp
+    transform/lower_return.h
+    transform/lower_return.cpp
+    transform/classify_control.h
+    transform/classify_control.cpp
     util/array.h
     util/cast.h
     util/hash.h
@@ -87,6 +86,9 @@ set(THORIN_SOURCES
     util/symbol.h
     util/types.h
     util/utility.h
+    util/graphviz_dump.cpp
+    util/scoped_dump.h
+    util/scoped_dump.cpp
     )
 
 if(LLVM_FOUND)
@@ -104,6 +106,7 @@ if(LLVM_FOUND)
         be/llvm/runtime.cpp
         be/llvm/runtime.h
         be/llvm/vectorize.cpp
+        be/llvm/debug.cpp
     )
 endif()
 

src/thorin/analyses/cfg.cpp

@@ -6,7 +6,6 @@
 #include <stack>
 
 #include "thorin/world.h"
-#include "thorin/analyses/domfrontier.h"
 #include "thorin/analyses/domtree.h"
 #include "thorin/analyses/looptree.h"
 #include "thorin/analyses/scope.h"
@@ -30,7 +29,7 @@ Stream& CFNode::stream(Stream& s) const { return s << continuation(); }
 CFA::CFA(const Scope& scope)
     : scope_(scope)
     , entry_(node(scope.entry()))
-    , exit_ (node(scope.exit() ))
+    , exit_ (node(scope.entry()->world().end_scope()))
 {
     std::queue<Continuation*> cfg_queue;
     ContinuationSet cfg_done;
@@ -194,7 +193,6 @@ template<bool forward> const CFNodes& CFG<forward>::preds(const CFNode* n) const
 template<bool forward> const CFNodes& CFG<forward>::succs(const CFNode* n) const { assert(n != nullptr); return forward ? n->succs() : n->preds(); }
 template<bool forward> const DomTreeBase<forward>& CFG<forward>::domtree() const { return lazy_init(this, domtree_); }
 template<bool forward> const LoopTree<forward>& CFG<forward>::looptree() const { return lazy_init(this, looptree_); }
-template<bool forward> const DomFrontierBase<forward>& CFG<forward>::domfrontier() const { return lazy_init(this, domfrontier_); }
 
 template class CFG<true>;
 template class CFG<false>;

src/thorin/analyses/cfg.h

@@ -132,7 +132,6 @@ class CFG {
     const CFNode* operator [] (Continuation* continuation) const { return cfa()[continuation]; }    ///< Maps from @p l to @p CFNode.
     const DomTreeBase<forward>& domtree() const;
     const LoopTree<forward>& looptree() const;
-    const DomFrontierBase<forward>& domfrontier() const;
 
     static size_t index(const CFNode* n) { return forward ? n->f_index_ : n->b_index_; }
 
@@ -143,7 +142,6 @@ class CFG {
     Map<const CFNode*> rpo_;
     mutable std::unique_ptr<const DomTreeBase<forward>> domtree_;
     mutable std::unique_ptr<const LoopTree<forward>> looptree_;
-    mutable std::unique_ptr<const DomFrontierBase<forward>> domfrontier_;
 };
 
 //------------------------------------------------------------------------------