[llvm] 9c4b2ff - [MC][NFC] Ensure tests that intended to cover compact unwind code paths do so

Jez Ng via llvm-commits llvm-commits at lists.llvm.org
Wed Apr 20 15:11:39 PDT 2022


Author: Jez Ng
Date: 2022-04-20T18:11:33-04:00
New Revision: 9c4b2ff9cd3d5ef1c4ef302ab28dfb13737fdca9

URL: https://github.com/llvm/llvm-project/commit/9c4b2ff9cd3d5ef1c4ef302ab28dfb13737fdca9
DIFF: https://github.com/llvm/llvm-project/commit/9c4b2ff9cd3d5ef1c4ef302ab28dfb13737fdca9.diff

LOG: [MC][NFC] Ensure tests that intended to cover compact unwind code paths do so

These two tests were intended to cover the CU code paths, but invoked
llvm-mc using a generic "darwin" platform. However, MC only attempts to
emit CU for `macos >= 10.6` [1]. Thus we adjust the tests accordingly.

compact-unwind-cfi_def_cfa.s was added in 2fca51d3b45efcf00ffcfe2879cd6d7d98c26258
fp-setup-macho.s was added in 03ffa797ad4fe8f85da532aa3f687841a60b4c0c

[1]: https://github.com/llvm/llvm-project/blob/16c93aaa4a955676fe05f876bd036719a1b14b2d/llvm/lib/MC/MCObjectFileInfo.cpp#L43

Reviewed By: MaskRay, smeenai

Differential Revision: https://reviews.llvm.org/D124126

Added: 
    

Modified: 
    llvm/test/MC/X86/compact-unwind-cfi_def_cfa.s
    llvm/test/MC/X86/fp-setup-macho.s

Removed: 
    


################################################################################
diff  --git a/llvm/test/MC/X86/compact-unwind-cfi_def_cfa.s b/llvm/test/MC/X86/compact-unwind-cfi_def_cfa.s
index 164737d1499f2..c997ebe73bb63 100644
--- a/llvm/test/MC/X86/compact-unwind-cfi_def_cfa.s
+++ b/llvm/test/MC/X86/compact-unwind-cfi_def_cfa.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - | llvm-readobj --sections - | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-macosx10.6 -filetype=obj %s -o - | llvm-readobj --sections - | FileCheck %s
 
 // We were trying to generate compact unwind info for assembly like this.
 // The .cfi_def_cfa directive, however, throws a wrench into that and was
@@ -72,9 +72,9 @@ _foo:
 // CHECK:   Index: 1
 // CHECK:   Name: __eh_frame (5F 5F 65 68 5F 66 72 61 6D 65 00 00 00 00 00 00)
 // CHECK:   Segment: __TEXT (5F 5F 54 45 58 54 00 00 00 00 00 00 00 00 00 00)
-// CHECK:   Address: 0x70
+// CHECK:   Address:
 // CHECK:   Size: 0x40
-// CHECK:   Offset: 480
+// CHECK:   Offset:
 // CHECK:   Alignment: 3
 // CHECK:   RelocationOffset: 0x0
 // CHECK:   RelocationCount: 0

diff  --git a/llvm/test/MC/X86/fp-setup-macho.s b/llvm/test/MC/X86/fp-setup-macho.s
index 0067b02786137..c1077f3043c5b 100644
--- a/llvm/test/MC/X86/fp-setup-macho.s
+++ b/llvm/test/MC/X86/fp-setup-macho.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-macho -filetype obj -o - %s | llvm-readobj --sections - | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-macosx10.6 -filetype obj -o - %s | llvm-readobj --sections - | FileCheck %s
 
 _label:
 	.cfi_startproc


        


More information about the llvm-commits mailing list