clang: Read the address space from the ABIArgInfo

[arsenm]

Do not assume it's the alloca address space, we have an explicit
address space to use for the argument already. Also use the original
value's type instead of assuming DefaultAS.

[arsenm]

• clang: Remove dest LangAS argument from performAddrSpaceCast #138866
• clang: Read the address space from the ABIArgInfo #138865 👈 (View in Graphite)
• clang/OpenCL: Fix special casing OpenCL in call emission #138864
• clang: Fix broken implicit cast to generic address space #138863
• clang/OpenCL: Add baseline test showing broken codegen #138862
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-clang
@llvm/pr-subscribers-backend-amdgpu

@llvm/pr-subscribers-clang-codegen

Author: Matt Arsenault (arsenm)

Changes

Do not assume it's the alloca address space, we have an explicit
address space to use for the argument already. Also use the original
value's type instead of assuming DefaultAS.

---

Full diff: https://github.com/llvm/llvm-project/pull/138865.diff

1 Files Affected:

• (modified) clang/lib/CodeGen/CGCall.cpp (+4-4)

diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 1404bdfd69647..db8820a8c517e 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -5384,16 +5384,16 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         if (!NeedCopy) {
           // Skip the extra memcpy call.
           llvm::Value *V = getAsNaturalPointerTo(Addr, I->Ty);
-          auto *T = llvm::PointerType::get(
-              CGM.getLLVMContext(), CGM.getDataLayout().getAllocaAddrSpace());
+          auto *T = llvm::PointerType::get(CGM.getLLVMContext(),
+                                           ArgInfo.getIndirectAddrSpace());
 
           // FIXME: This should not depend on the language address spaces, and
           // only the contextual values. If the address space mismatches, see if
           // we can look through a cast to a compatible address space value,
           // otherwise emit a copy.
           llvm::Value *Val = getTargetHooks().performAddrSpaceCast(
-              *this, V, LangAS::Default, CGM.getASTAllocaAddressSpace(), T,
-              true);
+              *this, V, I->Ty.getAddressSpace(), CGM.getASTAllocaAddressSpace(),
+              T, true);
           if (ArgHasMaybeUndefAttr)
             Val = Builder.CreateFreeze(Val);
           IRCallArgs[FirstIRArg] = Val;

[Artem-B]

LGTM w/ a comment nit.

[arsenm]

Merge activity

• May 9, 8:13 AM EDT: A user started a stack merge that includes this pull request via Graphite.
• May 9, 8:16 AM EDT: Graphite rebased this pull request as part of a merge.
• May 9, 8:19 AM EDT: @arsenm merged this pull request with Graphite.