Address comments regarding allocaAS source casting on tempAlloca. and address more nits

Author: RiverDave

clang/lib/CIR/CodeGen/Address.h

@@ -16,9 +16,11 @@
 
 #include "mlir/IR/Value.h"
 #include "clang/AST/CharUnits.h"
+#include "clang/CIR/Dialect/IR/CIRAttrs.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "clang/CIR/MissingFeatures.h"
 #include "llvm/ADT/PointerIntPair.h"
+#include "llvm/Support/Casting.h"
 
 namespace clang::CIRGen {
 
@@ -114,6 +116,11 @@ class Address {
     return elementType;
   }
 
+  cir::TargetAddressSpaceAttr getAddressSpace() const {
+    auto ptrTy = llvm::dyn_cast<cir::PointerType>(getType());
+    return ptrTy.getAddrSpace();
+  }
+
   clang::CharUnits getAlignment() const { return alignment; }
 
   /// Get the operation which defines this address.

clang/lib/CIR/CodeGen/CIRGenExpr.cpp

@@ -1220,9 +1220,13 @@ LValue CIRGenFunction::emitCastLValue(const CastExpr *e) {
 
     clang::LangAS srcLangAS = e->getSubExpr()->getType().getAddressSpace();
     cir::TargetAddressSpaceAttr srcAS;
-    if (clang::isTargetAddressSpace(srcLangAS)) {
+    if (clang::isTargetAddressSpace(srcLangAS))
       srcAS = cir::toCIRTargetAddressSpace(getMLIRContext(), srcLangAS);
-    }
+    else
+      cgm.errorNYI(
+          e->getSourceRange(),
+          "emitCastLValue: address space conversion from unknown address "
+          "space");
 
     mlir::Value v = getTargetHooks().performAddrSpaceCast(
         *this, lv.getPointer(), srcAS, convertType(destTy));
@@ -2311,7 +2315,10 @@ Address CIRGenFunction::createTempAlloca(mlir::Type ty, CharUnits align,
   // in C++ the auto variables are in the default address space. Therefore
   // cast alloca to the default address space when necessary.
 
-  LangAS allocaAS = cgm.getLangTempAllocaAddressSpace();
+  LangAS allocaAS = alloca.getAddressSpace()
+                        ? clang::getLangASFromTargetAS(
+                              alloca.getAddressSpace().getValue().getUInt())
+                        : clang::LangAS::Default;
   LangAS dstTyAS = clang::LangAS::Default;
   if (getCIRAllocaAddressSpace()) {
     dstTyAS = clang::getLangASFromTargetAS(

clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp

@@ -1888,9 +1888,11 @@ mlir::Value ScalarExprEmitter::VisitCastExpr(CastExpr *ce) {
 
     clang::LangAS srcLangAS = subExpr->getType().getAddressSpace();
     cir::TargetAddressSpaceAttr subExprAS;
-    if (clang::isTargetAddressSpace(srcLangAS)) {
+    if (clang::isTargetAddressSpace(srcLangAS))
       subExprAS = cir::toCIRTargetAddressSpace(cgf.getMLIRContext(), srcLangAS);
-    }
+    else
+      cgf.cgm.errorNYI(subExpr->getSourceRange(),
+                       "non-target address space conversion");
     // Since target may map different address spaces in AST to the same address
     // space, an address space conversion may end up as a bitcast.
     return cgf.cgm.getTargetCIRGenInfo().performAddrSpaceCast(