commit e6c9497255c6fde8961729a85104ab0407aeeb5e
author Nicolas Capens <capn@google.com> Fri Oct 23 23:19:38 2020 -0400
committer Nicolas Capens <nicolascapens@google.com> Thu Oct 29 18:13:45 2020 +0000
tree 87589741dbedb0b33a127dfe82d8cc4f5a97cce6
parent 00c30ce8e0c4f2435adfbd10b2d11609463697a5

Fix LLVM pointer element type

llvm::PointerType::isValidElementType() checks that the pointee type is
not void. Use a byte pointer instead.

Bug: b/155148722
Change-Id: Ibf2fd23ce0a19a6947a6817f0b73753cfa170832
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/49568
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

src/Reactor/LLVMReactor.cpp

diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
index 7f6c96b..4ab185b 100644
--- a/src/Reactor/LLVMReactor.cpp
+++ b/src/Reactor/LLVMReactor.cpp
@@ -408,9 +408,10 @@
 	{
 		// void __msan_unpoison(const volatile void *a, size_t size)
 		auto voidTy = ::llvm::Type::getVoidTy(jit->context);
-		auto voidPtrTy = voidTy->getPointerTo();
+		auto int8Ty = ::llvm::Type::getInt8Ty(jit->context);
+		auto int8PtrTy = int8Ty->getPointerTo();
 		auto sizetTy = ::llvm::IntegerType::get(jit->context, sizeof(size_t) * 8);
-		auto funcTy = ::llvm::FunctionType::get(voidTy, { voidPtrTy, sizetTy }, false);
+		auto funcTy = ::llvm::FunctionType::get(voidTy, { int8PtrTy, sizetTy }, false);
 		auto func = jit->module->getOrInsertFunction("__msan_unpoison", funcTy);
 		auto size = jit->module->getDataLayout().getTypeStoreSize(elTy);
 		for(unsigned i = 0; i < numEls; i++)
@@ -424,7 +425,7 @@
 
 			// Insert __msan_unpoison call in conditional block
 			auto elPtr = jit->builder->CreateExtractElement(elPtrs, idx);
-			jit->builder->CreateCall(func, { jit->builder->CreatePointerCast(elPtr, voidPtrTy),
+			jit->builder->CreateCall(func, { jit->builder->CreatePointerCast(elPtr, int8PtrTy),
 			                                 ::llvm::ConstantInt::get(sizetTy, size) });
 			jit->builder->CreateBr(mergeBlock);
 			jit->builder->SetInsertPoint(mergeBlock);