add xfail and assertion

Author: seven-mile

clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

@@ -729,6 +729,9 @@ def AddressSpaceAttr : CIR_Attr<"AddressSpace", "addrspace"> {
 
     std::optional<int32_t>
     $cppClass::getValueFromLangAS(clang::LangAS langAS) {
+      assert((langAS == clang::LangAS::Default ||
+             clang::isTargetAddressSpace(langAS)) &&
+             "Language-specific address spaces are not supported");
       switch (langAS) {
       }]
       #

clang/lib/CIR/CodeGen/CIRGenTypes.cpp

@@ -605,14 +605,7 @@ mlir::Type CIRGenTypes::ConvertType(QualType T) {
     const ReferenceType *RTy = cast<ReferenceType>(Ty);
     QualType ETy = RTy->getPointeeType();
     auto PointeeType = convertTypeForMem(ETy);
-    // TODO(cir): when address space mapping in CIR lowering is implemented,
-    // passthrough these non-target address spaces like `opencl_global`
-    assert(!MissingFeatures::targetLoweringInfoAddressSpaceMap());
-    // Here we convert them to target AS ahead of time
-    LangAS langAS = ETy.getAddressSpace();
-    if (langAS != LangAS::Default)
-      langAS = getLangASFromTargetAS(Context.getTargetAddressSpace(langAS));
-    ResultType = Builder.getPointerTo(PointeeType, langAS);
+    ResultType = Builder.getPointerTo(PointeeType, ETy.getAddressSpace());
     assert(ResultType && "Cannot get pointer type?");
     break;
   }
@@ -627,14 +620,7 @@ mlir::Type CIRGenTypes::ConvertType(QualType T) {
     // if (PointeeType->isVoidTy())
     //  PointeeType = Builder.getI8Type();
 
-    // TODO(cir): when address space mapping in CIR lowering is implemented,
-    // passthrough these non-target address spaces like `opencl_global`
-    assert(!MissingFeatures::targetLoweringInfoAddressSpaceMap());
-    // Here we convert them to target AS ahead of time
-    LangAS langAS = ETy.getAddressSpace();
-    if (langAS != LangAS::Default)
-      langAS = getLangASFromTargetAS(Context.getTargetAddressSpace(langAS));
-    ResultType = Builder.getPointerTo(PointeeType, langAS);
+    ResultType = Builder.getPointerTo(PointeeType, ETy.getAddressSpace());
     assert(ResultType && "Cannot get pointer type?");
     break;
   }

clang/test/CIR/CodeGen/OpenCL/addrspace-alloca.cl

@@ -3,6 +3,9 @@
 // RUN: %clang_cc1 -cl-std=CL3.0 -O0 -fclangir -emit-llvm -triple spirv64-unknown-unknown %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s --check-prefix=LLVM
 
+// Lowering of language-specific AS not supported
+// XFAIL: *
+
 // CIR: cir.func @func(%arg0: !cir.ptr<!s32i, addrspace(target<3>)>
 // LLVM: @func(ptr addrspace(3)
 kernel void func(local int *p) {

clang/test/CIR/CodeGen/OpenCL/spirv-target.cl

@@ -4,6 +4,9 @@
 // RUN: %clang_cc1 -cl-std=CL3.0 -fclangir -emit-llvm -triple spirv64-unknown-unknown %s -o %t_64.ll
 // RUN: FileCheck --input-file=%t_64.ll %s --check-prefix=LLVM-SPIRV64
 
+// Lowering of language-specific AS not supported
+// XFAIL: *
+
 // CIR-SPIRV64: cir.triple = "spirv64-unknown-unknown"
 // LLVM-SPIRV64: target triple = "spirv64-unknown-unknown"