Reland #86923 with fixes

Fixes for sycl

Author: premanandrao

clang/lib/CodeGen/CGBlocks.cpp

@@ -965,7 +965,7 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo) {
     } else if (type->getAs<ReferenceType>()) {
       Builder.CreateStore(src.emitRawPointer(*this), blockField);
 
-      // If type is const-qualified, copy the value into the block field.
+     // If type is const-qualified, copy the value into the block field.
     } else if (type.isConstQualified() &&
                type.getObjCLifetime() == Qualifiers::OCL_Strong &&
                CGM.getCodeGenOpts().OptimizationLevel != 0) {

clang/lib/CodeGen/CGDecl.cpp

@@ -1721,7 +1721,7 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) {
     SmallString<256> AnnotStr;
     CGM.generateIntelFPGAAnnotation(&D, AnnotStr);
     if (!AnnotStr.empty()) {
-      llvm::Value *V = address.getPointer();
+      llvm::Value *V = address.emitRawPointer(*this);
       llvm::Type *DestPtrTy = llvm::PointerType::get(
           CGM.getLLVMContext(), address.getAddressSpace());
       llvm::Value *Arg = Builder.CreateBitCast(V, DestPtrTy, V->getName());
@@ -2639,7 +2639,7 @@ void CodeGenFunction::EmitParmDecl(const VarDecl &D, ParamValue Arg,
       auto PtrTy = getContext().getPointerType(Ty);
       AllocaPtr = CreateMemTemp(PtrTy, getContext().getTypeAlignInChars(PtrTy),
                                 D.getName() + ".indirect_addr");
-      EmitStoreOfScalar(DeclPtr.getPointer(), AllocaPtr, /* Volatile */ false,
+      EmitStoreOfScalar(DeclPtr.emitRawPointer(*this), AllocaPtr, /* Volatile */ false,
                         PtrTy);
     }
 

clang/lib/CodeGen/CGExpr.cpp

@@ -4093,7 +4093,7 @@ static Address emitArraySubscriptGEP(CodeGenFunction &CGF, Address addr,
     addr = emitArraySubscriptGEP(CGF, addr, indices,
                                  CGF.ConvertTypeForMem(eltType), inbounds,
                                  signedIndices, loc, eltAlign, name);
-    AddIVDepMetadata(CGF, arrayDecl, eltPtr);
+    AddIVDepMetadata(CGF, arrayDecl, addr.emitRawPointer(CGF));
     return addr;
   } else {
     // Remember the original array subscript for bpf target

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -2922,7 +2922,7 @@ Address CodeGenFunction::EmitFieldSYCLAnnotations(const FieldDecl *D,
                                                   Address Addr) {
   const auto *SYCLAnnotAttr = D->getAttr<SYCLAddIRAnnotationsMemberAttr>();
   assert(SYCLAnnotAttr && "no add_ir_annotations_member attribute");
-  llvm::Value *V = Addr.getPointer();
+  llvm::Value *V = Addr.emitRawPointer(*this);
   llvm::Type *VTy = V->getType();
   auto *PTy = dyn_cast<llvm::PointerType>(VTy);
   unsigned AS = PTy ? PTy->getAddressSpace() : 0;
@@ -2949,7 +2949,7 @@ Address CodeGenFunction::EmitIntelFPGAFieldAnnotations(const FieldDecl *D,
 Address CodeGenFunction::EmitIntelFPGAFieldAnnotations(SourceLocation Location,
                                                        Address Addr,
                                                        StringRef AnnotStr) {
-  llvm::Value *V = Addr.getPointer();
+  llvm::Value *V = Addr.emitRawPointer(*this);
   llvm::Type *VTy = V->getType();
   // llvm.ptr.annotation intrinsic accepts a pointer to integer of any width -
   // don't perform bitcasts if value is integer