[CFIInserter] Turn a reachable llvm_unreachable into a report_fatal_error. #168777
+7
−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
This prevents it from being optimized out in non-assert builds. Update X86 test to remove REQUIRES: asserts and check for LLVM ERROR. Add FileCheck to RISC-V test and remove UNSUPPORTED. This is the better fix for llvm#168772 and llvm#168525.
topperc
changed the title
Member
|
@llvm/pr-subscribers-backend-x86 Author: Craig Topper (topperc) ChangesThis prevents it from being optimized out in non-assert builds. Update X86 test to remove REQUIRES: asserts and check for LLVM ERROR. Add FileCheck to RISC-V test and remove UNSUPPORTED. This is the better fix for #168772 and #168525. Full diff: https://github.com/llvm/llvm-project/pull/168777.diff 3 Files Affected:
diff --git a/llvm/lib/CodeGen/CFIInstrInserter.cpp b/llvm/lib/CodeGen/CFIInstrInserter.cpp
index 14098bc821617..1e65dd230dc86 100644
--- a/llvm/lib/CodeGen/CFIInstrInserter.cpp
+++ b/llvm/lib/CodeGen/CFIInstrInserter.cpp
@@ -272,7 +272,7 @@ void CFIInstrInserter::calculateOutgoingCFAInfo(MBBCFAInfo &MBBInfo) {
CSRLocMap.insert(
{CFI.getRegister(), CSRSavedLocation(CSRReg, CSROffset)});
} else if (It->second.Reg != CSRReg || It->second.Offset != CSROffset) {
- llvm_unreachable("Different saved locations for the same CSR");
+ report_fatal_error("Different saved locations for the same CSR");
}
CSRSaved.set(CFI.getRegister());
}
diff --git a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
index d2e5a8208cecf..55515aa364016 100644
--- a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
+++ b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
@@ -1,7 +1,8 @@
-# RUN: llc -x mir < %s -mtriple=riscv64 \
+# RUN: not --crash llc %s -mtriple=riscv64 \
# RUN: -run-pass=cfi-instr-inserter \
-# RUN: -riscv-enable-cfi-instr-inserter=true
-# UNSUPPORTED: target={{.*}}
+# RUN: -riscv-enable-cfi-instr-inserter=true 2>&1 | FileCheck %s
+
+# CHECK: LLVM ERROR: Different saved locations for the same CSR
# Technically, it is possible that a callee-saved register is saved in multiple different locations.
# CFIInstrInserter should handle this, but currently it does not.
diff --git a/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir b/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
index ef9fb22476a71..8211f8940d27a 100644
--- a/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
+++ b/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
@@ -1,4 +1,3 @@
-# REQUIRES: asserts
# RUN: not --crash llc -o - %s -mtriple=x86_64-- \
# RUN: -run-pass=cfi-instr-inserter 2>&1 | FileCheck %s
# Test that CSR being saved in multiple locations can be caught by
@@ -10,8 +9,7 @@
}
...
---
-# CHECK: Different saved locations for the same CSR
-# CHECK-NEXT: UNREACHABLE executed
+# CHECK: LLVM ERROR: Different saved locations for the same CSR
name: inconsistentlocs
body: |
bb.0:
|
Member
|
@llvm/pr-subscribers-backend-risc-v Author: Craig Topper (topperc) ChangesThis prevents it from being optimized out in non-assert builds. Update X86 test to remove REQUIRES: asserts and check for LLVM ERROR. Add FileCheck to RISC-V test and remove UNSUPPORTED. This is the better fix for #168772 and #168525. Full diff: https://github.com/llvm/llvm-project/pull/168777.diff 3 Files Affected:
diff --git a/llvm/lib/CodeGen/CFIInstrInserter.cpp b/llvm/lib/CodeGen/CFIInstrInserter.cpp
index 14098bc821617..1e65dd230dc86 100644
--- a/llvm/lib/CodeGen/CFIInstrInserter.cpp
+++ b/llvm/lib/CodeGen/CFIInstrInserter.cpp
@@ -272,7 +272,7 @@ void CFIInstrInserter::calculateOutgoingCFAInfo(MBBCFAInfo &MBBInfo) {
CSRLocMap.insert(
{CFI.getRegister(), CSRSavedLocation(CSRReg, CSROffset)});
} else if (It->second.Reg != CSRReg || It->second.Offset != CSROffset) {
- llvm_unreachable("Different saved locations for the same CSR");
+ report_fatal_error("Different saved locations for the same CSR");
}
CSRSaved.set(CFI.getRegister());
}
diff --git a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
index d2e5a8208cecf..55515aa364016 100644
--- a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
+++ b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
@@ -1,7 +1,8 @@
-# RUN: llc -x mir < %s -mtriple=riscv64 \
+# RUN: not --crash llc %s -mtriple=riscv64 \
# RUN: -run-pass=cfi-instr-inserter \
-# RUN: -riscv-enable-cfi-instr-inserter=true
-# UNSUPPORTED: target={{.*}}
+# RUN: -riscv-enable-cfi-instr-inserter=true 2>&1 | FileCheck %s
+
+# CHECK: LLVM ERROR: Different saved locations for the same CSR
# Technically, it is possible that a callee-saved register is saved in multiple different locations.
# CFIInstrInserter should handle this, but currently it does not.
diff --git a/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir b/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
index ef9fb22476a71..8211f8940d27a 100644
--- a/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
+++ b/llvm/test/CodeGen/X86/cfi-inserter-verify-inconsistent-loc.mir
@@ -1,4 +1,3 @@
-# REQUIRES: asserts
# RUN: not --crash llc -o - %s -mtriple=x86_64-- \
# RUN: -run-pass=cfi-instr-inserter 2>&1 | FileCheck %s
# Test that CSR being saved in multiple locations can be caught by
@@ -10,8 +9,7 @@
}
...
---
-# CHECK: Different saved locations for the same CSR
-# CHECK-NEXT: UNREACHABLE executed
+# CHECK: LLVM ERROR: Different saved locations for the same CSR
name: inconsistentlocs
body: |
bb.0:
|
🐧 Linux x64 Test Results
|
lenary
reviewed
Nov 20, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/22564 Here is the relevant piece of the build log for the reference |
| @@ -1,7 +1,8 @@ | |||
| # RUN: llc -x mir < %s -mtriple=riscv64 \ | |||
| # RUN: not --crash llc %s -mtriple=riscv64 \ | |||
Collaborator
There was a problem hiding this comment.
With this change llc will now open cfi-multiple-locations.s for writing in the local directory (which may be write protected). Can we add back the "-x mir < " or add "-o -" or something to avoid this?
Contributor
There was a problem hiding this comment.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This prevents it from being optimized out in non-assert builds.
Update X86 test to remove REQUIRES: asserts and check for LLVM ERROR. Add FileCheck to RISC-V test and remove UNSUPPORTED.
This is the more complete fix for #168772 and #168525.