Reactor: Do not start the unreachable block with Unreachable

The LLVM Unreachable instruction is a terminator instruction. It is illegal to place any instructions after this in the same block. Bug: b/131914569 Change-Id: I6dd4ca4f8ca911dc94ba5674db598078060ef795 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30453Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com>

Reactor: Do not start the unreachable block with Unreachable
bec21fe9 · Ben Clayton · 97c13ad1 · bec21fe9 · bec21fe9
Commit bec21fe9 authored May 02, 2019 by Ben Clayton
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Reactor.cpp src/Reactor/Reactor.cpp +2 -2

Reactor.hpp src/Reactor/Reactor.hpp +2 -2

No files found.
--- a/src/Reactor/Reactor.cpp
+++ b/src/Reactor/Reactor.cpp
@@ -4196,15 +4196,15 @@ namespace rr
 	void Return()
 	{
 		Nucleus::createRetVoid();
+		// Place any unreachable instructions in an unreferenced block.
 		Nucleus::setInsertBlock(Nucleus::createBasicBlock());
-		Nucleus::createUnreachable();
 	}
 	void Return(RValue<Int> ret)
 	{
 		Nucleus::createRet(ret.value);
+		// Place any unreachable instructions in an unreferenced block.
 		Nucleus::setInsertBlock(Nucleus::createBasicBlock());
-		Nucleus::createUnreachable();
 	}
 	void branch(RValue<Bool> cmp, BasicBlock *bodyBB, BasicBlock *endBB)

--- a/src/Reactor/Reactor.hpp
+++ b/src/Reactor/Reactor.hpp
@@ -2973,8 +2973,8 @@ namespace rr
 	{
 		RR_DEBUG_INFO_UPDATE_LOC();
 		Nucleus::createRet(Nucleus::createLoad(ret.address, Pointer<T>::getType()));
+		// Place any unreachable instructions in an unreferenced block.
 		Nucleus::setInsertBlock(Nucleus::createBasicBlock());
-		Nucleus::createUnreachable();
 	}
 	template<class T>
@@ -2982,8 +2982,8 @@ namespace rr
 	{
 		RR_DEBUG_INFO_UPDATE_LOC();
 		Nucleus::createRet(ret.value);
+		// Place any unreachable instructions in an unreferenced block.
 		Nucleus::setInsertBlock(Nucleus::createBasicBlock());
-		Nucleus::createUnreachable();
 	}
 	template<typename Return, typename... Arguments>