Automerge: [utils][UpdateTestChecks] update_llc_test_checks.py - armv7-apple-darwin triple no longer working (#150906)

woruyu · github-actions[bot] · commit 4974e3803d46 · 2025-07-30T07:17:58.000Z
### Summary This PR resolves llvm/llvm-project#150207
diff --git a/llvm/test/CodeGen/ARM/fcopysign.ll b/llvm/test/CodeGen/ARM/fcopysign.ll
@@ -85,6 +85,7 @@ define float @test4() nounwind {
 ; SOFT-NEXT:    vadd.f32 d0, d0, d16
 ; SOFT-NEXT:    vmov r0, s0
 ; SOFT-NEXT:    pop {lr}
+; SOFT-NEXT:    bx lr
 ;
 ; HARD-LABEL: test4:
 ; HARD:       @ %bb.0: @ %entry
diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
@@ -165,12 +165,10 @@ class string:
 )
 
 ASM_FUNCTION_ARM_DARWIN_RE = re.compile(
-    r"@[ \t]--[ \t]Begin[ \t]function[ \t](?P<func>[^ \t]+?)\n"
-    r"^[ \t]*\.globl[ \t]*_(?P=func)[ \t]*"
+    r"^[ \t]*\.globl[ \t]*_(?P<func>[^ \t]+)[ \t]*\@[ \t]*--[ \t]Begin[ \t]function[ \t](?P=func)\n"
     r"(?P<directives>.*?)"
-    r"^_(?P=func):\n[ \t]*"
-    r"(?P<body>.*?)"
-    r"^[ \t]*@[ \t]--[ \t]End[ \t]function",
+    r"^_(?P=func):.*?\n"
+    r"(?P<body>.*?)(?=^[ \t]*@[ \t]--[ \t]End[ \t]function)",
     flags=(re.M | re.S),
 )
 

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,10 @@ class string:`
`165`	`165`	`)`
`166`	`166`
`167`	`167`	`ASM_FUNCTION_ARM_DARWIN_RE = re.compile(`
`168`		`- r"@[ \t]--[ \t]Begin[ \t]function[ \t](?P<func>[^ \t]+?)\n"`
`169`		`- r"^[ \t]\.globl[ \t]_(?P=func)[ \t]*"`
	`168`	`+ r"^[ \t]\.globl[ \t]_(?P<func>[^ \t]+)[ \t]\@[ \t]--[ \t]Begin[ \t]function[ \t](?P=func)\n"`
`170`	`169`	`r"(?P<directives>.*?)"`
`171`		`- r"^_(?P=func):\n[ \t]*"`
`172`		`- r"(?P<body>.*?)"`
`173`		`- r"^[ \t]*@[ \t]--[ \t]End[ \t]function",`
	`170`	`+ r"^_(?P=func):.*?\n"`
	`171`	`+ r"(?P<body>.?)(?=^[ \t]@[ \t]--[ \t]End[ \t]function)",`
`174`	`172`	`flags=(re.M \| re.S),`
`175`	`173`	`)`
`176`	`174`