fixup! [clang][CodeGen] add addr space cast if needed when storing ptrs

Author: macurtis-amd

clang/lib/CodeGen/CGDecl.cpp

@@ -1566,7 +1566,7 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) {
       AllocaAddr =
           RawAddress(ReturnValue.emitRawPointer(*this),
                      ReturnValue.getElementType(), ReturnValue.getAlignment());
-      address = MaybeCastAllocaAddressSpace(AllocaAddr, Ty.getAddressSpace());
+      address = MaybeCastStackAddressSpace(AllocaAddr, Ty.getAddressSpace());
 
       if (const RecordType *RecordTy = Ty->getAs<RecordType>()) {
         const auto *RD = RecordTy->getOriginalDecl()->getDefinitionOrSelf();

clang/lib/CodeGen/CGExpr.cpp

@@ -108,8 +108,9 @@ CodeGenFunction::CreateTempAllocaWithoutCast(llvm::Type *Ty, CharUnits Align,
   return RawAddress(Alloca, Ty, Align, KnownNonNull);
 }
 
-RawAddress CodeGenFunction::MaybeCastAllocaAddressSpace(
-    RawAddress Alloca, LangAS DestLangAS, llvm::Value *ArraySize) {
+RawAddress CodeGenFunction::MaybeCastStackAddressSpace(RawAddress Alloca,
+                                                       LangAS DestLangAS,
+                                                       llvm::Value *ArraySize) {
 
   llvm::Value *V = Alloca.getPointer();
   // Alloca always returns a pointer in alloca address space, which may
@@ -141,7 +142,7 @@ RawAddress CodeGenFunction::CreateTempAlloca(llvm::Type *Ty, LangAS DestLangAS,
   RawAddress Alloca = CreateTempAllocaWithoutCast(Ty, Align, Name, ArraySize);
   if (AllocaAddr)
     *AllocaAddr = Alloca;
-  return MaybeCastAllocaAddressSpace(Alloca, DestLangAS, ArraySize);
+  return MaybeCastStackAddressSpace(Alloca, DestLangAS, ArraySize);
 }
 
 /// CreateTempAlloca - This creates an alloca and inserts it into the entry

clang/lib/CodeGen/CodeGenFunction.h

@@ -2807,8 +2807,8 @@ class CodeGenFunction : public CodeGenTypeCache {
 private:
   /// If \p Alloca is not in the same address space as \p DestLangAS, insert an
   /// address space cast and return a new RawAddress based on this value.
-  RawAddress MaybeCastAllocaAddressSpace(RawAddress Alloca, LangAS DestLangAS,
-                                         llvm::Value *ArraySize = nullptr);
+  RawAddress MaybeCastStackAddressSpace(RawAddress Alloca, LangAS DestLangAS,
+                                        llvm::Value *ArraySize = nullptr);
 
 public:
   /// CreateTempAlloca - This creates an alloca and inserts it into the entry