commit 741fd1fc8780455749fa9aa9c834e61cfe2c7f75
author alan-baker <alanbaker@google.com> Tue Apr 14 17:38:15 2020 -0400
committer GitHub <noreply@github.com> Tue Apr 14 17:38:15 2020 -0400
tree 4bdf13a7696577e576a48049146733c6550ffce3
parent e86004535cb2b3ee96872e19472a617a8038224c

Update llvm (#563)

* All LoadInst constructors require a type now
* InlineFunction only takes a CallBase reference now

lib/ReplaceOpenCLBuiltinPass.cpp

diff --git a/lib/ReplaceOpenCLBuiltinPass.cpp b/lib/ReplaceOpenCLBuiltinPass.cpp
index 43a933e..e8e231c 100644
--- a/lib/ReplaceOpenCLBuiltinPass.cpp
+++ b/lib/ReplaceOpenCLBuiltinPass.cpp
@@ -1469,7 +1469,7 @@
       auto Index = GetElementPtrInst::Create(ShortTy, Cast, Arg0, "", CI);
 
       // Load from the short* we casted to.
-      auto Load = new LoadInst(Index, "", CI);
+      auto Load = new LoadInst(ShortTy, Index, "", CI);
 
       // ZExt the short -> int.
       auto ZExt = CastInst::CreateZExtOrBitCast(Load, IntTy, "", CI);
@@ -1511,7 +1511,7 @@
       auto Ptr = GetElementPtrInst::Create(IntTy, Cast, IndexIntoI32, "", CI);
 
       // Load from the int* we casted to.
-      auto Load = new LoadInst(Ptr, "", CI);
+      auto Load = new LoadInst(IntTy, Ptr, "", CI);
 
       // Get our float2.
       auto Call = CallInst::Create(NewF, Load, "", CI);
@@ -1546,7 +1546,7 @@
     auto Index = GetElementPtrInst::Create(IntTy, Cast, Arg0, "", CI);
 
     // Load from the int* we casted to.
-    auto Load = new LoadInst(Index, "", CI);
+    auto Load = new LoadInst(IntTy, Index, "", CI);
 
     // Our intrinsic to unpack a float2 from an int.
     auto SPIRVIntrinsic = "spirv.unpack.v2f16";
@@ -1581,7 +1581,7 @@
     auto Index = GetElementPtrInst::Create(Int2Ty, Cast, Arg0, "", CI);
 
     // Load from the int2* we casted to.
-    auto Load = new LoadInst(Index, "", CI);
+    auto Load = new LoadInst(Int2Ty, Index, "", CI);
 
     // Extract each element from the loaded int2.
     auto X =
@@ -1627,7 +1627,7 @@
     auto NewFType = FunctionType::get(Float2Ty, IntTy, false);
 
     auto IndexedPtr = GetElementPtrInst::Create(IntTy, Ptr, Index, "", CI);
-    auto Load = new LoadInst(IndexedPtr, "", CI);
+    auto Load = new LoadInst(IntTy, IndexedPtr, "", CI);
 
     // Our intrinsic to unpack a float2 from an int.
     auto SPIRVIntrinsic = "spirv.unpack.v2f16";
@@ -1660,7 +1660,7 @@
     auto NewFType = FunctionType::get(Float2Ty, IntTy, false);
 
     auto IndexedPtr = GetElementPtrInst::Create(Int2Ty, Ptr, Index, "", CI);
-    auto Load = new LoadInst(IndexedPtr, "", CI);
+    auto Load = new LoadInst(Int2Ty, IndexedPtr, "", CI);
 
     // Extract each element from the loaded int2.
     auto X =
@@ -1785,7 +1785,7 @@
           CastInst::CreatePointerCast(Arg2, IntPointerTy, "base_i32_ptr", CI);
       auto OutPtr = GetElementPtrInst::Create(IntTy, BaseI32Ptr, IndexIntoI32,
                                               "base_i32_ptr", CI);
-      auto CurrentValue = new LoadInst(OutPtr, "current_value", CI);
+      auto CurrentValue = new LoadInst(IntTy, OutPtr, "current_value", CI);
       auto Shift = BinaryOperator::CreateShl(IndexIsOdd, Four, "shift", CI);
       auto MaskBitsToWrite =
           BinaryOperator::CreateShl(FFFF, Shift, "mask_bits_to_write", CI);