Skip to content

Conversation

@lenary
Copy link
Member

@lenary lenary commented Nov 19, 2025

No description provided.

@lenary lenary enabled auto-merge (squash) November 19, 2025 20:49
@lenary lenary disabled auto-merge November 19, 2025 20:49
@lenary lenary enabled auto-merge (squash) November 19, 2025 20:49
@llvmbot
Copy link
Member

llvmbot commented Nov 19, 2025

@llvm/pr-subscribers-backend-risc-v

Author: Sam Elliott (lenary)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/168772.diff

1 Files Affected:

  • (modified) llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir (+1-1)
diff --git a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
index 08544a95dedb7..d2e5a8208cecf 100644
--- a/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
+++ b/llvm/test/CodeGen/RISCV/cfi-multiple-locations.mir
@@ -1,4 +1,4 @@
-# RUN: llc %s -mtriple=riscv64 \
+# RUN: llc -x mir < %s -mtriple=riscv64 \
 # RUN: -run-pass=cfi-instr-inserter \
 # RUN: -riscv-enable-cfi-instr-inserter=true
 # UNSUPPORTED: target={{.*}}

@lenary
Copy link
Member Author

lenary commented Nov 19, 2025

This addresses the issue in #164479 (comment)

@topperc
Copy link
Collaborator

topperc commented Nov 19, 2025

Is this just making it output to stdout because using stdin defaults to using stdout?

@topperc
Copy link
Collaborator

topperc commented Nov 19, 2025

I'm working on a more complete fix to make this test work again.

@topperc
Copy link
Collaborator

topperc commented Nov 19, 2025

I'm working on a more complete fix to make this test work again.

Looks like we have a test for the same unreachable in X86 as well, but it's got REQUIRES: asserts

@lenary lenary merged commit 2b16ae0 into llvm:main Nov 19, 2025
9 of 11 checks passed
topperc added a commit to topperc/llvm-project that referenced this pull request Nov 19, 2025
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.
@lenary
Copy link
Member Author

lenary commented Nov 20, 2025

Sorry, I should have paid more attention. This is indeed just fixing it so it uses stdin/stdout rather than leaving a file somewhere it shouldn't. I would have directly committed this - I only opened a PR as that's what is expected of us now, but I see that's not very productive.

I'll look at the better PR

topperc added a commit that referenced this pull request Nov 20, 2025
…rror. (#168777)

This prevents it from being optimized out in non-asserts 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants