[clang][CodeGen] sret args should always point to the alloca AS, so use that
#114062
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1672,8 +1672,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) { | |
|
|
||
| // Add type for sret argument. | ||
| if (IRFunctionArgs.hasSRetArg()) { | ||
| unsigned AddressSpace = CGM.getDataLayout().getAllocaAddrSpace(); | ||
| ArgTypes[IRFunctionArgs.getSRetArgNo()] = | ||
| llvm::PointerType::get(getLLVMContext(), AddressSpace); | ||
| } | ||
|
|
@@ -5145,7 +5144,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, | |
| // If the call returns a temporary with struct return, create a temporary | ||
| // alloca to hold the result, unless one is given to us. | ||
| Address SRetPtr = Address::invalid(); | ||
| llvm::Value *UnusedReturnSizePtr = nullptr; | ||
| if (RetAI.isIndirect() || RetAI.isInAlloca() || RetAI.isCoerceAndExpand()) { | ||
| // For virtual function pointer thunks and musttail calls, we must always | ||
|
|
@@ -5159,16 +5157,19 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, | |
| } else if (!ReturnValue.isNull()) { | ||
| SRetPtr = ReturnValue.getAddress(); | ||
| } else { | ||
| SRetPtr = CreateMemTempWithoutCast(RetTy, "tmp"); | ||
| if (HaveInsertPoint() && ReturnValue.isUnused()) { | ||
| llvm::TypeSize size = | ||
| CGM.getDataLayout().getTypeAllocSize(ConvertTypeForMem(RetTy)); | ||
| UnusedReturnSizePtr = EmitLifetimeStart(size, SRetPtr.getBasePointer()); | ||
| } | ||
| } | ||
| if (IRFunctionArgs.hasSRetArg()) { | ||
| // If the caller allocated the return slot, it is possible that the | ||
| // alloca was AS casted to the default as, so we ensure the cast is | ||
| // stripped before binding to the sret arg, which is in the allocaAS. | ||
|
There was a problem hiding this comment. Sorry, what? It seems really wrong to be blindly stripping pointer casts here. Can you explain what code pattern is leading to us not having a pointer in the right address space? There was a problem hiding this comment. It's not really blind (albeit it might be somewhat tightly coupling |
||
| IRCallArgs[IRFunctionArgs.getSRetArgNo()] = | ||
| getAsNaturalPointerTo(SRetPtr, RetTy)->stripPointerCasts(); | ||
| } else if (RetAI.isInAlloca()) { | ||
| Address Addr = | ||
| Builder.CreateStructGEP(ArgMemory, RetAI.getInAllocaFieldIndex()); | ||
|
|
@@ -5740,7 +5741,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, | |
| // pop this cleanup later on. Being eager about this is OK, since this | ||
| // temporary is 'invisible' outside of the callee. | ||
| if (UnusedReturnSizePtr) | ||
| pushFullExprCleanup<CallLifetimeEnd>(NormalEHLifetimeMarker, SRetPtr, | ||
| UnusedReturnSizePtr); | ||
|
|
||
| llvm::BasicBlock *InvokeDest = CannotThrow ? nullptr : getInvokeDest(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,34 @@ | ||
| // RUN: %clang_cc1 %s -Wno-strict-prototypes -emit-llvm -o - | FileCheck %s | ||
| // RUN: %clang_cc1 %s -Wno-strict-prototypes -triple amdgcn-amd-amdhsa -emit-llvm -o - | FileCheck --check-prefix=NONZEROALLOCAAS %s | ||
|
|
||
| struct abc { | ||
| long a; | ||
| long b; | ||
| long c; | ||
| long d; | ||
| long e; | ||
| long f; | ||
| long g; | ||
| long h; | ||
| long i; | ||
| long j; | ||
| }; | ||
|
|
||
| struct abc foo1(void); | ||
| // CHECK-DAG: declare {{.*}} @foo1(ptr dead_on_unwind writable sret(%struct.abc) | ||
| // NONZEROALLOCAAS-DAG: declare {{.*}} @foo1(ptr addrspace(5) dead_on_unwind writable sret(%struct.abc) | ||
| struct abc foo2(); | ||
| // CHECK-DAG: declare {{.*}} @foo2(ptr dead_on_unwind writable sret(%struct.abc) | ||
| // NONZEROALLOCAAS-DAG: declare {{.*}} @foo2(ptr addrspace(5) dead_on_unwind writable sret(%struct.abc) | ||
| struct abc foo3(void){} | ||
| // CHECK-DAG: define {{.*}} @foo3(ptr dead_on_unwind noalias writable sret(%struct.abc) | ||
| // NONZEROALLOCAAS-DAG: define {{.*}} @foo3(ptr addrspace(5) dead_on_unwind noalias writable sret(%struct.abc) | ||
|
|
||
| void bar(void) { | ||
| struct abc dummy1 = foo1(); | ||
| // CHECK-DAG: call {{.*}} @foo1(ptr dead_on_unwind writable sret(%struct.abc) | ||
| // NONZEROALLOCAAS-DAG: call {{.*}} @foo1(ptr addrspace(5) dead_on_unwind writable sret(%struct.abc) | ||
| struct abc dummy2 = foo2(); | ||
| // CHECK-DAG: call {{.*}} @foo2(ptr dead_on_unwind writable sret(%struct.abc) | ||
| // NONZEROALLOCAAS-DAG: call {{.*}} @foo2(ptr addrspace(5) dead_on_unwind writable sret(%struct.abc) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.