[GVN] Handle empty attrs in Expression == #115761
Merged
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
|
@llvm/pr-subscribers-llvm-transforms Author: None (macurtis-amd) ChangesFull diff: https://github.com/llvm/llvm-project/pull/115761.diff 2 Files Affected:
diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp
index e27f5a08c85a97..a3df7a0a39e6b2 100644
--- a/llvm/lib/Transforms/Scalar/GVN.cpp
+++ b/llvm/lib/Transforms/Scalar/GVN.cpp
@@ -156,7 +156,7 @@ struct llvm::GVNPass::Expression {
return false;
if (varargs != other.varargs)
return false;
- if (!attrs.isEmpty() && !other.attrs.isEmpty() &&
+ if ((!attrs.isEmpty() || !other.attrs.isEmpty()) &&
!attrs.intersectWith(type->getContext(), other.attrs).has_value())
return false;
return true;
diff --git a/llvm/test/Transforms/GVN/intersect-empty-attr.ll b/llvm/test/Transforms/GVN/intersect-empty-attr.ll
new file mode 100644
index 00000000000000..013b01c700ce4e
--- /dev/null
+++ b/llvm/test/Transforms/GVN/intersect-empty-attr.ll
@@ -0,0 +1,19 @@
+; RUN: opt -S -passes=gvn < %s | FileCheck %s
+
+declare i32 @bar() #0
+
+define i32 @foo() {
+entry:
+ %0 = tail call i32 @bar() #1
+ %1 = tail call i32 @bar()
+ ret i32 1
+}
+
+; CHECK-LABEL: define i32 @foo(
+; CHECK: %0 = tail call i32 @bar() #1
+; CHECK-NEXT: %1 = tail call i32 @bar()
+; CHECK-NEXT: ret i32 1
+; CHECK-NEXT: }
+
+attributes #0 = { memory(none) }
+attributes #1 = { "llvm.assume"="ompx_no_call_asm" }
|
|
Does it address the crash reported in #114545 (comment)? |
yes it does, thanks! |
ronlieb
approved these changes
Nov 12, 2024
nikic
reviewed
Nov 12, 2024
Change-Id: I75e876452af701191d36331703654581c6eb46f2
macurtis-amd
force-pushed
the
fix-gvn-empty-attr
branch
from
565d70e to
0f08b59
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/183/builds/6156 Here is the relevant piece of the build log for the reference |
searlmc1
pushed a commit
to ROCm/llvm-project
that referenced
this pull request
Nov 12, 2024
relands: eea8b44 [GVN] Handle empty attrs in Expression == (llvm#115761) 984bca9 [GVN][NewGVN] Take call attributes into account in expressions (llvm#114545) Reverts: breaks comgr build 41e3919 [clang] Introduce diagnostics suppression mappings (llvm#112517) Change-Id: I3189bf1b5d66b980d2d711c3fe1d5fe217699bb1
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.
No description provided.