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

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

Author: wwXing0

llvm/lib/IR/Constants.cpp

@@ -2226,7 +2226,7 @@ Constant *ConstantExpr::getAddrSpaceCast(Constant *C, Type *DstTy,
                                          bool OnlyIfReduced) {
   assert(CastInst::castIsValid(Instruction::AddrSpaceCast, C, DstTy) &&
          "Invalid constantexpr addrspacecast!");
-
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
   // Canonicalize addrspacecasts between different pointer types by first
   // bitcasting the pointer type and then converting the address space.
   PointerType *SrcScalarTy = cast<PointerType>(C->getType()->getScalarType());
@@ -2241,6 +2241,7 @@ Constant *ConstantExpr::getAddrSpaceCast(Constant *C, Type *DstTy,
     }
     C = getBitCast(C, MidTy);
   }
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
   return getFoldedCast(Instruction::AddrSpaceCast, C, DstTy, OnlyIfReduced);
 }
 

llvm/lib/IR/Instructions.cpp

@@ -3397,6 +3397,11 @@ unsigned CastInst::isEliminableCastPair(
         "Illegal addrspacecast, bitcast sequence!");
       // Allowed, use first cast's opcode
       return firstOp;
+#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
+    case 14:
+      // bitcast, addrspacecast -> addrspacecast
+      return Instruction::AddrSpaceCast;
+#else // INTEL_SYCL_OPAQUEPOINTER_READY
     case 14: {
       // bitcast, addrspacecast -> addrspacecast if the element type of
       // bitcast's source is the same as that of addrspacecast's destination.
@@ -3406,6 +3411,7 @@ unsigned CastInst::isEliminableCastPair(
         return Instruction::AddrSpaceCast;
       return 0;
     }
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
     case 15:
       // FIXME: this state can be merged with (1), but the following assert
       // is useful to check the correcteness of the sequence due to semantic

llvm/lib/Transforms/Scalar/InferAddressSpaces.cpp

@@ -1321,15 +1321,10 @@ bool InferAddressSpacesImpl::rewriteWithNewAddressSpaces(
         if (AddrSpaceCastInst *ASC = dyn_cast<AddrSpaceCastInst>(CurUser)) {
           unsigned NewAS = NewV->getType()->getPointerAddressSpace();
           if (ASC->getDestAddressSpace() == NewAS) {
-#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
-            if (!cast<PointerType>(ASC->getType()->getScalarType())
-                     ->hasSameElementTypeAs(
-                         cast<PointerType>(NewV->getType()->getScalarType()))) {
-#else
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
             if (!cast<PointerType>(ASC->getType())
                     ->hasSameElementTypeAs(
                         cast<PointerType>(NewV->getType()))) {
-#endif
               BasicBlock::iterator InsertPos;
               if (Instruction *NewVInst = dyn_cast<Instruction>(NewV))
                 InsertPos = std::next(NewVInst->getIterator());
@@ -1341,6 +1336,7 @@ bool InferAddressSpacesImpl::rewriteWithNewAddressSpaces(
               NewV = CastInst::Create(Instruction::BitCast, NewV,
                                       ASC->getType(), "", &*InsertPos);
             }
+#endif
             ASC->replaceAllUsesWith(NewV);
             DeadInstructions.push_back(ASC);
             continue;