[SelectionDAG] improve error message for invalid op bundles #148722
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
Created using spr 1.3.4
Member
|
@llvm/pr-subscribers-backend-x86 @llvm/pr-subscribers-llvm-selectiondag Author: Florian Mayer (fmayer) ChangesFull diff: https://github.com/llvm/llvm-project/pull/148722.diff 2 Files Affected:
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index ecd1ff87e7fbc..3a6fd6283daed 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3351,13 +3351,29 @@ void SelectionDAGBuilder::visitInvoke(const InvokeInst &I) {
// Deopt and ptrauth bundles are lowered in helper functions, and we don't
// have to do anything here to lower funclet bundles.
- if (I.hasOperandBundlesOtherThan(
- {LLVMContext::OB_deopt, LLVMContext::OB_gc_transition,
- LLVMContext::OB_gc_live, LLVMContext::OB_funclet,
- LLVMContext::OB_cfguardtarget, LLVMContext::OB_ptrauth,
- LLVMContext::OB_clang_arc_attachedcall}))
+ constexpr std::array<uint32_t, 7> kAllowedBundles = {
+ LLVMContext::OB_deopt,
+ LLVMContext::OB_gc_transition,
+ LLVMContext::OB_gc_live,
+ LLVMContext::OB_funclet,
+ LLVMContext::OB_cfguardtarget,
+ LLVMContext::OB_ptrauth,
+ LLVMContext::OB_clang_arc_attachedcall};
+ if (I.hasOperandBundlesOtherThan(kAllowedBundles)) {
+ std::string Error;
+ for (unsigned i = 0, e = I.getNumOperandBundles(); i != e; ++i) {
+ OperandBundleUse U = I.getOperandBundleAt(i);
+ bool First = true;
+ if (is_contained(kAllowedBundles, U.getTagID()))
+ continue;
+ if (!First)
+ Error += ", ";
+ First = false;
+ Error += U.getTagName();
+ }
reportFatalUsageError(
- "cannot lower invokes with arbitrary operand bundles!");
+ Twine("cannot lower invokes with arbitrary operand bundles: ", Error));
+ }
const Value *Callee(I.getCalledOperand());
const Function *Fn = dyn_cast<Function>(Callee);
diff --git a/llvm/test/CodeGen/X86/invalid-operand-bundle-invoke.ll b/llvm/test/CodeGen/X86/invalid-operand-bundle-invoke.ll
index 8091a220a44c5..1da41aeab68b9 100644
--- a/llvm/test/CodeGen/X86/invalid-operand-bundle-invoke.ll
+++ b/llvm/test/CodeGen/X86/invalid-operand-bundle-invoke.ll
@@ -1,6 +1,6 @@
; RUN: not llc -mtriple=x86_64-unknown-linux-gnu < %s 2>&1 | FileCheck %s
-; CHECK: LLVM ERROR: cannot lower invokes with arbitrary operand bundles!
+; CHECK: LLVM ERROR: cannot lower invokes with arbitrary operand bundles: foo
declare void @g()
declare i32 @__gxx_personality_v0(...)
|
arsenm
approved these changes
Jul 14, 2025
fmayer
deleted the
users/fmayer/spr/selectiondag-improve-error-message-for-invalid-op-bundles
branch
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/123/builds/23358 Here is the relevant piece of the build log for the reference |
nikic
reviewed
Jul 15, 2025
| reportFatalUsageError( | ||
| "cannot lower invokes with arbitrary operand bundles!"); | ||
| Twine("cannot lower invokes with arbitrary operand bundles: ", Error)); | ||
| } |
Contributor
There was a problem hiding this comment.
This updated one of three places emitting this error. Please extract this into a helper function and use it in all three places.
| LLVMContext::OB_gc_live, LLVMContext::OB_funclet, | ||
| LLVMContext::OB_cfguardtarget, LLVMContext::OB_ptrauth, | ||
| LLVMContext::OB_clang_arc_attachedcall, LLVMContext::OB_kcfi})) | ||
| constexpr uint32_t kAllowedBundles[] = { |
Contributor
There was a problem hiding this comment.
LLVM does not use hungarian notation.
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.