[SPIRV] Fix asan failure #138695
Merged
[SPIRV] Fix asan failure #138695
Conversation
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
When the DataLayout is destroyed, the memory backing `Offsets` is released. This causes a use after free. To fix it, I added a DataLayout varible that will not be destroyed until after Offsets is used. Fixes asan failure caused by llvm#135789
|
@llvm/pr-subscribers-backend-spir-v Author: Steven Perron (s-perron) ChangesWhen the DataLayout is destroyed, the memory backing To fix it, I added a DataLayout varible that will not be destroyed until Fixes asan failure caused by #135789 Full diff: https://github.com/llvm/llvm-project/pull/138695.diff 1 Files Affected:
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
index 35ddb906c366a..948869d5c5260 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -2062,8 +2062,9 @@ void SPIRVGlobalRegistry::updateAssignType(CallInst *AssignCI, Value *Arg,
void SPIRVGlobalRegistry::addStructOffsetDecorations(
Register Reg, StructType *Ty, MachineIRBuilder &MIRBuilder) {
+ DataLayout DL;
ArrayRef<TypeSize> Offsets =
- DataLayout().getStructLayout(Ty)->getMemberOffsets();
+ DL.getStructLayout(Ty)->getMemberOffsets();
for (uint32_t I = 0; I < Ty->getNumElements(); ++I) {
buildOpMemberDecorate(Reg, MIRBuilder, SPIRV::Decoration::Offset, I,
{static_cast<uint32_t>(Offsets[I])});
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Keenuts
approved these changes
May 6, 2025
cassiebeckley
approved these changes
May 6, 2025
kstoimenov
added a commit
that referenced
this pull request
May 6, 2025
Breaks bot: https://lab.llvm.org/buildbot/#/builders/24/builds/8151 This reverts commit 097fef2.
|
@s-perron I reverted this and the other related change FYI... |
s-perron
added a commit
to s-perron/llvm-project
that referenced
this pull request
May 7, 2025
The asan failure was fixed by llvm#138695, but another failure was introduced in the meantime. The cause for the other failure has been fixed. I will reapply the two PRs. Reapply "[SPIRV] Add explicit layout (llvm#135789)" This reverts commit 0fb5720. Reapply "[SPIRV] Fix asan failure (llvm#138695)" This reverts commit df90ab9.
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
When the DataLayout is destroyed, the memory backing `Offsets` is released. This causes a use after free. To fix it, I added a DataLayout varible that will not be destroyed until after Offsets is used. Fixes asan failure caused by llvm#135789
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
Breaks bot: https://lab.llvm.org/buildbot/#/builders/24/builds/8151 This reverts commit 097fef2.
s-perron
added a commit
that referenced
this pull request
May 7, 2025
The asan failure was fixed by #138695, but another failure was introduced in the meantime. The cause for the other failure has been fixed. I will reapply the two PRs. Reapply "[SPIRV] Add explicit layout (#135789)" This reverts commit 0fb5720. Reapply "[SPIRV] Fix asan failure (#138695)" This reverts commit df90ab9.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When the DataLayout is destroyed, the memory backing
Offsetsisreleased. This causes a use after free.
To fix it, I added a DataLayout varible that will not be destroyed until
after Offsets is used.
Fixes asan failure caused by #135789