Skip to content

Conversation

@thurstond
Copy link
Contributor

@thurstond thurstond commented Nov 25, 2024

llvm/test/MC/AArch64/local-bounds-single-trap.ll was introduced in #65972 to demonstrate that nomerge did not work properly, which is documented in the header comment.

#101549 fixed nomerge for trap builtins and ae6dc64 updated the test assertions, but not the header comment. This patch updates the header comment accordingly.

…e-trap.ll

llvm/test/MC/AArch64/local-bounds-single-trap.ll was introduced in https://github.com/llvm/llvm-project/pull/65972/files to demonstrate that nomerge did not work properly, which is documented in the header comment.

llvm#101549 fixed nomerge for trap builtins and llvm@ae6dc64 updated the test assertions, but not the header comment. This patch updates the header comment accordingly.
@llvmbot
Copy link
Member

llvmbot commented Nov 25, 2024

@llvm/pr-subscribers-backend-aarch64

@llvm/pr-subscribers-mc

Author: Thurston Dang (thurstond)

Changes

llvm/test/MC/AArch64/local-bounds-single-trap.ll was introduced in #65972 to demonstrate that nomerge did not work properly, which is documented in the header comment.

#101549 fixed nomerge for trap builtins and ae6dc64 updated the test assertions, but not the header comment. This patch updates the header comment accordingly.


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

1 Files Affected:

  • (modified) llvm/test/MC/AArch64/local-bounds-single-trap.ll (+4-3)
diff --git a/llvm/test/MC/AArch64/local-bounds-single-trap.ll b/llvm/test/MC/AArch64/local-bounds-single-trap.ll
index 6a017e24ab3cdf..8b8a3e430df692 100644
--- a/llvm/test/MC/AArch64/local-bounds-single-trap.ll
+++ b/llvm/test/MC/AArch64/local-bounds-single-trap.ll
@@ -1,7 +1,8 @@
 ; RUN: llc -O3 -mtriple arm64-linux -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-ASM
-; What this test does is check that even with nomerge, the functions still get merged in
-; compiled code as the ubsantrap call gets lowered to a single instruction: brk.
-
+; This test checks that nomerge correctly prevents the traps from being merged
+; in the compiled code.
+; Prior to ae6dc64ec670891cb15049277e43133d4df7fb4b, this test showed that
+; nomerge did not work correctly.
 
 @B = dso_local global [10 x i8] zeroinitializer, align 1
 @B2 = dso_local global [10 x i8] zeroinitializer, align 1

@thurstond thurstond merged commit 752ef93 into llvm:main Nov 26, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend:AArch64 llvm:mc Machine (object) code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants