From bc6bc56db51d06b92dc63ef9c9e0def6c9760c9e Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Wed, 1 Jun 2022 22:29:10 -0700
Subject: Clean up void returns. (#2260)

* Clean up `IRReturnVoid`.

* Update gitignore.

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-ir-lower-error-handling.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'source/slang/slang-ir-lower-error-handling.cpp')

diff --git a/source/slang/slang-ir-lower-error-handling.cpp b/source/slang/slang-ir-lower-error-handling.cpp
index 5a1389e57..387ab45b4 100644
--- a/source/slang/slang-ir-lower-error-handling.cpp
+++ b/source/slang/slang-ir-lower-error-handling.cpp
@@ -130,15 +130,8 @@ struct ErrorHandlingLoweringContext
         auto resultType =
             builder.getResultType(funcType->getResultType(), throwAttr->getErrorType());
         IRInst* resultVal = nullptr;
-        if (ret->getOp() == kIROp_ReturnVal)
-        {
-            auto val = cast<IRReturnVal>(ret)->getVal();
-            resultVal = builder.emitMakeResultValue(resultType, val);
-        }
-        else
-        {
-            resultVal = builder.emitMakeResultValueVoid(resultType);
-        }
+        auto val = cast<IRReturn>(ret)->getVal();
+        resultVal = builder.emitMakeResultValue(resultType, val);
         builder.emitReturn(resultVal);
         ret->removeAndDeallocate();
     }
@@ -169,8 +162,7 @@ struct ErrorHandlingLoweringContext
         case kIROp_TryCall:
             processTryCall(cast<IRTryCall>(inst));
             break;
-        case kIROp_ReturnVal:
-        case kIROp_ReturnVoid:
+        case kIROp_Return:
             processReturn(cast<IRReturn>(inst));
             break;
         case kIROp_Throw:
@@ -206,7 +198,7 @@ struct ErrorHandlingLoweringContext
         // Deduplicate equivalent types.
         sharedBuilder.deduplicateAndRebuildGlobalNumberingMap();   
 
-        // Translate all IRTryCall, IRThrow, IRReturn, IRReturnVal.
+        // Translate all IRTryCall, IRThrow, IRReturn.
         processInsts();
 
         // Lower all functypes.
-- 
cgit v1.2.3