From 768e62f6c7541439e2edc18dad5fb3846d2e05f9 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 10 Oct 2022 15:59:45 -0700
Subject: Support multi-level break + single-return conversion + general
 inline. (#2436)

* Support multi-level break.

* Single return.

* Add test for inlining `void` return-type functions.

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-ir-simplify-cfg.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'source/slang/slang-ir-simplify-cfg.cpp')

diff --git a/source/slang/slang-ir-simplify-cfg.cpp b/source/slang/slang-ir-simplify-cfg.cpp
index af0e7c0ce..db0274d32 100644
--- a/source/slang/slang-ir-simplify-cfg.cpp
+++ b/source/slang/slang-ir-simplify-cfg.cpp
@@ -6,7 +6,7 @@
 namespace Slang
 {
 
-bool processFunc(IRFunc* func)
+bool processFunc(IRGlobalValueWithCode* func)
 {
     auto firstBlock = func->getFirstBlock();
     if (!firstBlock)
@@ -23,6 +23,15 @@ bool processFunc(IRFunc* func)
         workList.fastRemoveAt(0);
         while (block)
         {
+            if (auto loop = as<IRLoop>(block->getTerminator()))
+            {
+                auto continueBlock = loop->getContinueBlock();
+                if (continueBlock && !continueBlock->hasMoreThanOneUse())
+                {
+                    loop->continueBlock.set(loop->getTargetBlock());
+                    continueBlock->removeAndDeallocate();
+                }
+            }
             // If `block` does not end with an unconditional branch, bail.
             if (block->getTerminator()->getOp() != kIROp_unconditionalBranch)
                 break;
@@ -33,6 +42,8 @@ bool processFunc(IRFunc* func)
             // merge point in CFG. Such blocks will have more than one use.
             if (successor->hasMoreThanOneUse())
                 break;
+            if (block->hasMoreThanOneUse())
+                break;
             changed = true;
             Index paramIndex = 0;
             auto inst = successor->getFirstDecorationOrChild();
@@ -79,4 +90,9 @@ bool simplifyCFG(IRModule* module)
     return changed;
 }
 
+bool simplifyCFG(IRGlobalValueWithCode* func)
+{
+    return processFunc(func);
+}
+
 } // namespace Slang
-- 
cgit v1.2.3