Skip to content

Commit 1a8f13c

Browse files
e-kude-kud
committed
Reduce some of the tests
1 parent 4e80fb8 commit 1a8f13c

File tree

2 files changed

+12
-249
lines changed

2 files changed

+12
-249
lines changed

‎llvm/test/tools/llvm-objcopy/COFF/strip-update-ehcont.test‎

Lines changed: 8 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
# ORIG: Name: .text
1212
# ORIG: Name: ?foo@@YAXXZ
1313
# ORIG: Name: .data
14-
# ORIG: Name: ??_R0H@8
14+
# ORIG: Name: .drectve
1515
# ORIG: Name: .debug$S
1616
# ORIG: Name: .gehcont$y
17-
# ORIG: Name: .pdata
18-
# ORIG: Name: @feat.00
1917
# ORIG: Name: ?foo2@@YAXXZ
2018
# ORIG: Name: $ehgcr_0_1
2119
# ORIG: Hex dump of section '.gehcont$y':
22-
# ORIG-NEXT: 0x00000000 18000000 18000000 18000000 ............
20+
# ORIG-NEXT: 0x00000000 12000000 12000000 12000000 ............
2321

2422
# .debug$S is going to be stripped and $ehgcr_0_1 index is decreased by 2
2523

@@ -30,15 +28,12 @@
3028
# STRIP: Name: .text
3129
# STRIP: Name: ?foo@@YAXXZ
3230
# STRIP: Name: .data
33-
# STRIP: Name: ??_R0H@8
3431
# STRIP: Name: .drectve
3532
# STRIP: Name: .gehcont$y
36-
# STRIP: Name: .pdata
37-
# STRIP: Name: @feat.00
3833
# STRIP: Name: ?foo2@@YAXXZ
3934
# STRIP: Name: $ehgcr_0_1
4035
# STRIP: Hex dump of section '.gehcont$y':
41-
# STRIP-NEXT: 0x00000000 16000000 16000000 16000000 ............
36+
# STRIP-NEXT: 0x00000000 10000000 10000000 10000000 ............
4237

4338
--- !COFF
4439
header:
@@ -71,10 +66,6 @@ sections:
7166
Alignment: 16
7267
SectionData: '000000000000000000000000000000002E48000000000000'
7368
SizeOfRawData: 24
74-
Relocations:
75-
- VirtualAddress: 0
76-
SymbolName: '??_7type_info@@6B@'
77-
Type: IMAGE_REL_AMD64_ADDR64
7869
- Name: .drectve
7970
Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
8071
Alignment: 1
@@ -83,105 +74,13 @@ sections:
8374
- Name: '.debug$S'
8475
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
8576
Alignment: 4
86-
SectionData: 04000000F1000000380000000A00011100000000000000002A003C1101000000D000EA070000000000000852000000000000536F6D6520646562756720696E666F000000
87-
Subsections:
88-
- !Symbols
89-
Records:
90-
- Kind: S_OBJNAME
91-
ObjNameSym:
92-
Signature: 0
93-
ObjectName: ''
94-
- Kind: S_COMPILE3
95-
Compile3Sym:
96-
Flags: [ ]
97-
Machine: X64
98-
FrontendMajor: 2026
99-
FrontendMinor: 0
100-
FrontendBuild: 0
101-
FrontendQFE: 0
102-
BackendMajor: 21000
103-
BackendMinor: 0
104-
BackendBuild: 0
105-
BackendQFE: 0
106-
Version: Some debug info
107-
SizeOfRawData: 68
77+
SectionData: 04000000F100000044656275672073656374696F6E20746F20626520737472697070656400
78+
SizeOfRawData: 37
10879
- Name: '.gehcont$y'
10980
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
11081
Alignment: 4
111-
SectionData: '180000001800000018000000'
82+
SectionData: '120000001200000012000000'
11283
SizeOfRawData: 12
113-
- Name: .xdata
114-
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ ]
115-
Alignment: 4
116-
SectionData: 190A03350A030552015000000000000000000000190E02000A320650000000000000000022059319020000000000000001000000000000000400000000000000200000000000000001000000FFFFFFFF00000000FFFFFFFF00000000000000000000000001000000010000000000000000000000000000002C000000000000003800000000000000FFFFFFFF130000000000000018000000FFFFFFFF0000000001000000
117-
SizeOfRawData: 164
118-
Relocations:
119-
- VirtualAddress: 12
120-
SymbolName: __CxxFrameHandler3
121-
Type: IMAGE_REL_AMD64_ADDR32NB
122-
- VirtualAddress: 16
123-
SymbolName: '$cppxdata$?foo@@YAXXZ'
124-
Type: IMAGE_REL_AMD64_ADDR32NB
125-
- VirtualAddress: 28
126-
SymbolName: __CxxFrameHandler3
127-
Type: IMAGE_REL_AMD64_ADDR32NB
128-
- VirtualAddress: 32
129-
SymbolName: '$cppxdata$?foo@@YAXXZ'
130-
Type: IMAGE_REL_AMD64_ADDR32NB
131-
- VirtualAddress: 44
132-
SymbolName: '$stateUnwindMap$?foo@@YAXXZ'
133-
Type: IMAGE_REL_AMD64_ADDR32NB
134-
- VirtualAddress: 52
135-
SymbolName: '$tryMap$?foo@@YAXXZ'
136-
Type: IMAGE_REL_AMD64_ADDR32NB
137-
- VirtualAddress: 60
138-
SymbolName: '$ip2state$?foo@@YAXXZ'
139-
Type: IMAGE_REL_AMD64_ADDR32NB
140-
- VirtualAddress: 108
141-
SymbolName: '$handlerMap$0$?foo@@YAXXZ'
142-
Type: IMAGE_REL_AMD64_ADDR32NB
143-
- VirtualAddress: 116
144-
SymbolName: '??_R0H@8'
145-
Type: IMAGE_REL_AMD64_ADDR32NB
146-
- VirtualAddress: 124
147-
SymbolName: '?catch$2@?0??foo@@YAXXZ@4HA'
148-
Type: IMAGE_REL_AMD64_ADDR32NB
149-
- VirtualAddress: 132
150-
SymbolTableIndex: 6
151-
Type: IMAGE_REL_AMD64_ADDR32NB
152-
- VirtualAddress: 140
153-
SymbolTableIndex: 6
154-
Type: IMAGE_REL_AMD64_ADDR32NB
155-
- VirtualAddress: 148
156-
SymbolTableIndex: 6
157-
Type: IMAGE_REL_AMD64_ADDR32NB
158-
- VirtualAddress: 156
159-
SymbolName: '?catch$2@?0??foo@@YAXXZ@4HA'
160-
Type: IMAGE_REL_AMD64_ADDR32NB
161-
- Name: .pdata
162-
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ ]
163-
Alignment: 4
164-
SectionData: 000000001E00000000000000200000003B00000014000000
165-
SizeOfRawData: 24
166-
Relocations:
167-
- VirtualAddress: 0
168-
SymbolTableIndex: 6
169-
Type: IMAGE_REL_AMD64_ADDR32NB
170-
- VirtualAddress: 4
171-
SymbolTableIndex: 6
172-
Type: IMAGE_REL_AMD64_ADDR32NB
173-
- VirtualAddress: 8
174-
SymbolName: .xdata
175-
Type: IMAGE_REL_AMD64_ADDR32NB
176-
- VirtualAddress: 12
177-
SymbolTableIndex: 6
178-
Type: IMAGE_REL_AMD64_ADDR32NB
179-
- VirtualAddress: 16
180-
SymbolTableIndex: 6
181-
Type: IMAGE_REL_AMD64_ADDR32NB
182-
- VirtualAddress: 20
183-
SymbolName: .xdata
184-
Type: IMAGE_REL_AMD64_ADDR32NB
18584
symbols:
18685
- Name: .text
18786
Value: 0
@@ -238,19 +137,6 @@ symbols:
238137
SimpleType: IMAGE_SYM_TYPE_NULL
239138
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
240139
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
241-
- Name: .xdata
242-
Value: 0
243-
SectionNumber: 9
244-
SimpleType: IMAGE_SYM_TYPE_NULL
245-
ComplexType: IMAGE_SYM_DTYPE_NULL
246-
StorageClass: IMAGE_SYM_CLASS_STATIC
247-
SectionDefinition:
248-
Length: 164
249-
NumberOfRelocations: 14
250-
NumberOfLinenumbers: 0
251-
CheckSum: 135891540
252-
Number: 4
253-
Selection: IMAGE_COMDAT_SELECT_ASSOCIATIVE
254140
- Name: .data
255141
Value: 0
256142
SectionNumber: 5
@@ -264,12 +150,6 @@ symbols:
264150
CheckSum: 2602060666
265151
Number: 5
266152
Selection: IMAGE_COMDAT_SELECT_ANY
267-
- Name: '??_R0H@8'
268-
Value: 0
269-
SectionNumber: 5
270-
SimpleType: IMAGE_SYM_TYPE_NULL
271-
ComplexType: IMAGE_SYM_DTYPE_NULL
272-
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
273153
- Name: .drectve
274154
Value: 0
275155
SectionNumber: 6
@@ -289,10 +169,10 @@ symbols:
289169
ComplexType: IMAGE_SYM_DTYPE_NULL
290170
StorageClass: IMAGE_SYM_CLASS_STATIC
291171
SectionDefinition:
292-
Length: 68
172+
Length: 37
293173
NumberOfRelocations: 0
294174
NumberOfLinenumbers: 0
295-
CheckSum: 82254810
175+
CheckSum: 820498156
296176
Number: 7
297177
- Name: '.gehcont$y'
298178
Value: 0
@@ -306,25 +186,6 @@ symbols:
306186
NumberOfLinenumbers: 0
307187
CheckSum: 820498156
308188
Number: 8
309-
- Name: .pdata
310-
Value: 0
311-
SectionNumber: 10
312-
SimpleType: IMAGE_SYM_TYPE_NULL
313-
ComplexType: IMAGE_SYM_DTYPE_NULL
314-
StorageClass: IMAGE_SYM_CLASS_STATIC
315-
SectionDefinition:
316-
Length: 24
317-
NumberOfRelocations: 6
318-
NumberOfLinenumbers: 0
319-
CheckSum: 3872633945
320-
Number: 4
321-
Selection: IMAGE_COMDAT_SELECT_ASSOCIATIVE
322-
- Name: '@feat.00'
323-
Value: 16384
324-
SectionNumber: -1
325-
SimpleType: IMAGE_SYM_TYPE_NULL
326-
ComplexType: IMAGE_SYM_DTYPE_NULL
327-
StorageClass: IMAGE_SYM_CLASS_STATIC
328189
- Name: '?foo2@@YAXXZ'
329190
Value: 0
330191
SectionNumber: 0
@@ -337,52 +198,4 @@ symbols:
337198
SimpleType: IMAGE_SYM_TYPE_NULL
338199
ComplexType: IMAGE_SYM_DTYPE_NULL
339200
StorageClass: IMAGE_SYM_CLASS_STATIC
340-
- Name: __CxxFrameHandler3
341-
Value: 0
342-
SectionNumber: 0
343-
SimpleType: IMAGE_SYM_TYPE_NULL
344-
ComplexType: IMAGE_SYM_DTYPE_NULL
345-
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
346-
- Name: '$cppxdata$?foo@@YAXXZ'
347-
Value: 36
348-
SectionNumber: 9
349-
SimpleType: IMAGE_SYM_TYPE_NULL
350-
ComplexType: IMAGE_SYM_DTYPE_NULL
351-
StorageClass: IMAGE_SYM_CLASS_STATIC
352-
- Name: '?catch$2@?0??foo@@YAXXZ@4HA'
353-
Value: 32
354-
SectionNumber: 4
355-
SimpleType: IMAGE_SYM_TYPE_NULL
356-
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
357-
StorageClass: IMAGE_SYM_CLASS_STATIC
358-
- Name: '$stateUnwindMap$?foo@@YAXXZ'
359-
Value: 76
360-
SectionNumber: 9
361-
SimpleType: IMAGE_SYM_TYPE_NULL
362-
ComplexType: IMAGE_SYM_DTYPE_NULL
363-
StorageClass: IMAGE_SYM_CLASS_STATIC
364-
- Name: '$tryMap$?foo@@YAXXZ'
365-
Value: 92
366-
SectionNumber: 9
367-
SimpleType: IMAGE_SYM_TYPE_NULL
368-
ComplexType: IMAGE_SYM_DTYPE_NULL
369-
StorageClass: IMAGE_SYM_CLASS_STATIC
370-
- Name: '$ip2state$?foo@@YAXXZ'
371-
Value: 132
372-
SectionNumber: 9
373-
SimpleType: IMAGE_SYM_TYPE_NULL
374-
ComplexType: IMAGE_SYM_DTYPE_NULL
375-
StorageClass: IMAGE_SYM_CLASS_STATIC
376-
- Name: '$handlerMap$0$?foo@@YAXXZ'
377-
Value: 112
378-
SectionNumber: 9
379-
SimpleType: IMAGE_SYM_TYPE_NULL
380-
ComplexType: IMAGE_SYM_DTYPE_NULL
381-
StorageClass: IMAGE_SYM_CLASS_STATIC
382-
- Name: '??_7type_info@@6B@'
383-
Value: 0
384-
SectionNumber: 0
385-
SimpleType: IMAGE_SYM_TYPE_NULL
386-
ComplexType: IMAGE_SYM_DTYPE_NULL
387-
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
388201
...

‎llvm/test/tools/llvm-objcopy/COFF/strip-wrong-winguards.test‎

Lines changed: 4 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# RUN: yaml2obj %s -o %t.in.o
2-
# RUN: llvm-readobj -r -s -x '.gfids$y' -x '.giats$y' -x '.gljmp$y' %t.in.o | FileCheck %s --check-prefix=ORIG
2+
# RUN: llvm-readobj -r -s -x '.gfids$y' %t.in.o | FileCheck %s --check-prefix=ORIG
33
# RUN: not llvm-objcopy --strip-debug %t.in.o %t.out.o 2>&1 | FileCheck %s --check-prefix=ERROR
44

55
# ORIG: Relocations [
66
# ORIG-NEXT: Section (1) .text {
7-
# ORIG-NEXT: 0x3 IMAGE_REL_AMD64_REL32 foo (10)
7+
# ORIG-NEXT: 0x3 IMAGE_REL_AMD64_REL32 foo (6)
88
# ORIG-NEXT: }
99
# ORIG-NEXT: ]
1010
# ORIG: Symbols [
@@ -14,25 +14,9 @@
1414
# ORIG: AuxSectionDef {
1515
# ORIG: Checksum: 0x459345AD
1616
# ORIG: }
17-
# ORIG: Name: .giats$y
18-
# ORIG: Section: .giats$y
19-
# ORIG: AuxSymbolCount: 1
20-
# ORIG: AuxSectionDef {
21-
# ORIG: Checksum: 0x0
22-
# ORIG: }
23-
# ORIG: Name: .gljmp$y
24-
# ORIG: Section: .gljmp$y
25-
# ORIG: AuxSymbolCount: 1
26-
# ORIG: AuxSectionDef {
27-
# ORIG: Checksum: 0x0
28-
# ORIG: }
2917
# ORIG: ]
3018
# ORIG: Hex dump of section '.gfids$y':
31-
# ORIG-NEXT: 0x00000000 0a000000 10000000 ........
32-
# ORIG: Hex dump of section '.giats$y':
33-
# ORIG-EMPTY-NEXT:
34-
# ORIG: Hex dump of section '.gljmp$y':
35-
# ORIG-EMPTY-NEXT:
19+
# ORIG-NEXT: 0x00000000 06000000 10000000 ........
3620

3721
# ERROR: section '.gfids$y' contains a .symidx (16) that is incorrect or was stripped
3822

@@ -58,18 +42,8 @@ sections:
5842
- Name: '.gfids$y'
5943
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
6044
Alignment: 4
61-
SectionData: '0A00000010000000'
45+
SectionData: '0600000010000000'
6246
SizeOfRawData: 8
63-
- Name: '.giats$y'
64-
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
65-
Alignment: 4
66-
SectionData: ''
67-
SizeOfRawData: 0
68-
- Name: '.gljmp$y'
69-
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
70-
Alignment: 4
71-
SectionData: ''
72-
SizeOfRawData: 0
7347
symbols:
7448
- Name: .text
7549
Value: 0
@@ -107,30 +81,6 @@ symbols:
10781
NumberOfLinenumbers: 0
10882
CheckSum: 1167279533
10983
Number: 5
110-
- Name: '.giats$y'
111-
Value: 0
112-
SectionNumber: 4
113-
SimpleType: IMAGE_SYM_TYPE_NULL
114-
ComplexType: IMAGE_SYM_DTYPE_NULL
115-
StorageClass: IMAGE_SYM_CLASS_STATIC
116-
SectionDefinition:
117-
Length: 0
118-
NumberOfRelocations: 0
119-
NumberOfLinenumbers: 0
120-
CheckSum: 0
121-
Number: 6
122-
- Name: '.gljmp$y'
123-
Value: 0
124-
SectionNumber: 5
125-
SimpleType: IMAGE_SYM_TYPE_NULL
126-
ComplexType: IMAGE_SYM_DTYPE_NULL
127-
StorageClass: IMAGE_SYM_CLASS_STATIC
128-
SectionDefinition:
129-
Length: 0
130-
NumberOfRelocations: 0
131-
NumberOfLinenumbers: 0
132-
CheckSum: 0
133-
Number: 7
13484
- Name: foo
13585
Value: 0
13686
SectionNumber: 0

0 commit comments

Comments
 (0)