Merge from 'main' to 'sycl-web' (1 commits)

  CONFLICT (content): Merge conflict in llvm/lib/Transforms/Scalar/SROA.cpp

Author: KornevNikita

llvm/lib/Transforms/Scalar/SROA.cpp

@@ -1511,7 +1511,6 @@ static void speculateSelectInstLoads(SelectInst &SI, LoadInst &LI,
                                      IRBuilderTy &IRB) {
   LLVM_DEBUG(dbgs() << "    original load: " << SI << "\n");
 
-  IRB.SetInsertPoint(&SI);
   Value *TV = SI.getTrueValue();
   Value *FV = SI.getFalseValue();
   // Replace the given load of the select with a select of two loads.
@@ -1525,6 +1524,13 @@ static void speculateSelectInstLoads(SelectInst &SI, LoadInst &LI,
     TV = IRB.CreateBitCast(TV, LoadPtrType);
   if (LoadPtrType != FV->getType())
     FV = IRB.CreateBitCast(FV, LoadPtrType);
+
+  if (auto *TypedPtrTy = LI.getPointerOperandType();
+      !TypedPtrTy->isOpaquePointerTy() && SI.getType() != TypedPtrTy) {
+    TV = IRB.CreateBitOrPointerCast(TV, TypedPtrTy, "");
+    FV = IRB.CreateBitOrPointerCast(FV, TypedPtrTy, "");
+  }
+
   LoadInst *TL =
       IRB.CreateAlignedLoad(LI.getType(), TV, LI.getAlign(),
                             LI.getName() + ".sroa.speculate.load.true");