From bc6bc56db51d06b92dc63ef9c9e0def6c9760c9e Mon Sep 17 00:00:00 2001 From: Yong He 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 --- source/slang/slang-emit-c-like.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source/slang/slang-emit-c-like.cpp') diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp index 895421783..6b6d462b9 100644 --- a/source/slang/slang-emit-c-like.cpp +++ b/source/slang/slang-emit-c-like.cpp @@ -2104,13 +2104,13 @@ void CLikeSourceEmitter::_emitInst(IRInst* inst) // folded into use site(s) break; - case kIROp_ReturnVoid: - m_writer->emit("return;\n"); - break; - - case kIROp_ReturnVal: - m_writer->emit("return "); - emitOperand(((IRReturnVal*) inst)->getVal(), getInfo(EmitOp::General)); + case kIROp_Return: + m_writer->emit("return"); + if (((IRReturn*)inst)->getVal()->getOp() != kIROp_VoidLit) + { + m_writer->emit(" "); + emitOperand(((IRReturn*) inst)->getVal(), getInfo(EmitOp::General)); + } m_writer->emit(";\n"); break; @@ -2268,8 +2268,7 @@ void CLikeSourceEmitter::emitRegion(Region* inRegion) // its behavior has been folded into the next region. break; - case kIROp_ReturnVal: - case kIROp_ReturnVoid: + case kIROp_Return: case kIROp_discard: // For extremely simple terminators, we just handle // them here, so that we don't have to allocate -- cgit v1.2.3