[win][arm64ec] Fix duplicate errors with the dontcall attribute #152810
+35
−7
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-backend-x86 @llvm/pr-subscribers-backend-aarch64 Author: Daniel Paoliello (dpaoliello) ChangesSince the This change moves the checking for Full diff: https://github.com/llvm/llvm-project/pull/152810.diff 2 Files Affected:
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
index fb9eff942a464..5bc158a660080 100644
--- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -1148,9 +1148,11 @@ bool FastISel::lowerCall(const CallInst *CI) {
CLI.setCallee(RetTy, FuncTy, CI->getCalledOperand(), std::move(Args), *CI)
.setTailCall(IsTailCall);
- diagnoseDontCall(*CI);
-
- return lowerCallTo(CLI);
+ if (lowerCallTo(CLI)) {
+ diagnoseDontCall(*CI);
+ return true;
+ } else
+ return false;
}
bool FastISel::selectCall(const User *I) {
diff --git a/llvm/test/CodeGen/AArch64/arm64ec-dont-call.ll b/llvm/test/CodeGen/AArch64/arm64ec-dont-call.ll
new file mode 100644
index 0000000000000..febb8997f3e37
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/arm64ec-dont-call.ll
@@ -0,0 +1,21 @@
+; RUN: not llc -mtriple arm64ec-windows-msvc -o - %s 2>&1 | FileCheck %s
+
+define void @baz() #0 {
+ call void @foo()
+ ret void
+}
+
+define void @foo() #1 {
+ ret void
+}
+
+attributes #0 = { noinline optnone }
+attributes #1 = { "dontcall-error"="oh no foo" }
+
+; Regression test for `dontcall-error` for Arm64EC. Since this attribute is
+; checked both by FastISel and SelectionDAGBuilder, and FastISel was bailing for
+; Arm64EC AFTER doing the check, we ended up with duplicate copies of this
+; error.
+
+; CHECK: error: call to #foo marked "dontcall-error": oh no foo
+; CHECK-NOT: error:
|
arsenm
reviewed
Aug 9, 2025
| @@ -0,0 +1,21 @@ | |||
| ; RUN: not llc -mtriple arm64ec-windows-msvc -o - %s 2>&1 | FileCheck %s | |||
There was a problem hiding this comment.
Suggested change
| ; RUN: not llc -mtriple arm64ec-windows-msvc -o - %s 2>&1 | FileCheck %s | |
| ; RUN: not llc -mtriple=arm64ec-windows-msvc -filetype=null %s 2>&1 | FileCheck %s |
Comment on lines
1154
to
1155
| } else | ||
| return false; |
There was a problem hiding this comment.
Suggested change
| } else | |
| return false; | |
| } | |
| return false; |
No else after return
dpaoliello
force-pushed
the
arm64ecdontcal
branch
from
551006c to
634dead
Compare
dpaoliello
force-pushed
the
arm64ecdontcal
branch
from
634dead to
c9f311e
Compare
dpaoliello
force-pushed
the
arm64ecdontcal
branch
from
c9f311e to
f946fcc
Compare
arsenm
approved these changes
Aug 12, 2025
Comment on lines
2791
to
2792
| bool Result = translateCallBase(CI, MIRBuilder); | ||
| if (Result) { |
There was a problem hiding this comment.
Suggested change
| bool Result = translateCallBase(CI, MIRBuilder); | |
| if (Result) { | |
| if (translateCallBase(CI, MIRBuilder)) { |
dpaoliello
force-pushed
the
arm64ecdontcal
branch
from
f946fcc to
d7c6397
Compare
|
Possible build break: https://lab.llvm.org/buildbot/#/builders/154/builds/20134 Not sure why this change would mean NOT seeing the errors at all - is |
Fixed: #153302 |
dpaoliello
added a commit
that referenced
this pull request
Aug 12, 2025
…astSelectInstruction (#153302) Recently my change to avoid duplicate `dontcall` attribute errors (#152810) caused the Clang `Frontend/backend-attribute-error-warning.c` test to fail on Arm32: <https://lab.llvm.org/buildbot/#/builders/154/builds/20134> The root cause is that, if the default `IFastSel` path bails, then targets are given the opportunity to lower instructions via `fastSelectInstruction`. That's the path taken by Arm32 and since its implementation of `selectCall` didn't call `diagnoseDontCall` no error was emitted. I've checked the other implementations of `fastSelectInstruction` and the only other one that lowers call instructions in WebAssembly, so I've fixed that too.
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.
Since the
dontcall-*attributes are checked both byFastISel/GlobalISelandSelectionDAGBuilder, and bothFastISelandGlobalISelbail for calls on Arm64EC for AFTER doing the check, we ended up emitting duplicate copies of this error.This change moves the checking for
dontcall-*inFastISelandGlobalISelto after it has been successfully lowered.