This is an archive of the discontinued LLVM Phabricator instance.

Differential D80217

[lld-macho] Move all tests for erroneous inputs under invalid/
ClosedPublic

Authored by int3 on May 19 2020, 8:02 AM.

Details

Reviewers
ruiu
pcc
MaskRay
smeenai
alexander-shaposhnikov
gkm
Ktwu
christylee
Commits
rGf04d1c3b90c1: [lld-macho] Move all tests for erroneous inputs under invalid/
Summary

For consistency.

The no-id-dylib test was originally referencing the Inputs/ folder via a
relative path. Instead of updating that path, I decided to make the test
self-contained.

Diff Detail

Event Timeline

int3 created this revision.May 19 2020, 8:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 19 2020, 8:02 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
int3 updated this revision to Diff 264915.May 19 2020, 8:03 AM

update

Harbormaster failed remote builds in B57211: Diff 264915!May 19 2020, 8:41 AM
Harbormaster failed remote builds in B57210: Diff 264914!
MaskRay accepted this revision.May 19 2020, 9:39 AM

LGTM

This revision is now accepted and ready to land.May 19 2020, 9:39 AM
int3 added a child revision: D80414: [lld-macho] Ensure reads from nlist_64 structs are aligned when necessary.May 21 2020, 3:29 PM
Closed by commit rGf04d1c3b90c1: [lld-macho] Move all tests for erroneous inputs under invalid/ (authored by int3). · Explain WhyJun 2 2020, 1:44 PM
This revision was automatically updated to reflect the committed changes.
int3 mentioned this in rG1e1a3f67ee71: [lld-macho] Ensure reads from nlist_64 structs are aligned when necessary.

Revision Contents

Diff 267980

lld/test/MachO/Inputs/no-id-dylib.yaml

  • This file was moved to lld/test/MachO/invalid/no-id-dylink.yaml.

lld/test/MachO/alignment-too-large.yaml

  • This file was moved to lld/test/MachO/invalid/alignment-too-large.yaml.

lld/test/MachO/duplicate-symbol.s

  • This file was moved to lld/test/MachO/invalid/duplicate-symbol.s.

lld/test/MachO/invalid-executable.s

  • This file was moved to lld/test/MachO/invalid/invalid-executable.s.

lld/test/MachO/invalid-fat-narch.s

  • This file was moved to lld/test/MachO/invalid/invalid-fat-narch.s.

lld/test/MachO/invalid-fat-offset.s

  • This file was moved to lld/test/MachO/invalid/invalid-fat-offset.s.

lld/test/MachO/invalid/alignment-too-large.yaml

  • This file was moved from lld/test/MachO/alignment-too-large.yaml.
The contents of this file were not changed.

lld/test/MachO/invalid/duplicate-symbol.s

  • This file was moved from lld/test/MachO/duplicate-symbol.s.
The contents of this file were not changed.

lld/test/MachO/invalid/invalid-executable.s

  • This file was moved from lld/test/MachO/invalid-executable.s.
The contents of this file were not changed.

lld/test/MachO/invalid/invalid-fat-narch.s

  • This file was moved from lld/test/MachO/invalid-fat-narch.s.
The contents of this file were not changed.

lld/test/MachO/invalid/invalid-fat-offset.s

  • This file was moved from lld/test/MachO/invalid-fat-offset.s.
The contents of this file were not changed.

lld/test/MachO/invalid/missing-dylib.s

  • This file was moved from lld/test/MachO/missing-dylib.s.
The contents of this file were not changed.

lld/test/MachO/invalid/no-id-dylink.yaml

  • This file was moved from lld/test/MachO/Inputs/no-id-dylib.yaml.
## This yaml file was originally generated from linking the following source # REQUIRES: x86
## input with ld64: # RUN: mkdir -p %t
# RUN: yaml2obj %s -o %t/libnoid.dylib
# RUN: echo ".globl _main; .text; _main: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/no-id-dylink.o
# RUN: not lld -flavor darwinnew -o %t/no-id-dylink -Z -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s
# CHECK: error: dylib {{.*}}libnoid.dylib missing LC_ID_DYLIB load command
## This YAML file was originally generated from linking the following source
## input with ld64 and passing the resulting binary through obj2yaml:
## ##
## .section __TEXT,__cstring ## .section __TEXT,__cstring
## .globl _hello_world ## .globl _hello_world
## ##
## _hello_world: ## _hello_world:
## .asciz "Hello world!\n" ## .asciz "Hello world!\n"
## ##
## Then we deleted the LC_ID_DYLIB command from the YAML file. ## Then we deleted the LC_ID_DYLIB command from the file.
--- !mach-o !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x01000007 cputype: 0x01000007
cpusubtype: 0x00000003 cpusubtype: 0x00000003
filetype: 0x00000006 filetype: 0x00000006
ncmds: 10 ncmds: 10
sizeofcmds: 616 sizeofcmds: 616
flags: 0x00100085 flags: 0x00100085
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines - n_strx: 2
n_type: 0x0F n_type: 0x0F
n_sect: 2 n_sect: 2
n_desc: 0 n_desc: 0
n_value: 4082 n_value: 4082
StringTable: StringTable:
- ' ' - ' '
- _hello_world - _hello_world
- '' - ''
...

lld/test/MachO/invalid/no-such-file.s

  • This file was moved from lld/test/MachO/no-such-file.s.
The contents of this file were not changed.

lld/test/MachO/missing-dylib.s

  • This file was moved to lld/test/MachO/invalid/missing-dylib.s.

lld/test/MachO/no-id-dylink.s

  • This file was deleted.
# REQUIRES: x86
# RUN: mkdir -p %t
# RUN: yaml2obj %p/Inputs/no-id-dylib.yaml -o %t/libnoid.dylib
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/no-id-dylink.o
# RUN: not lld -flavor darwinnew -o %t/no-id-dylink -Z -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s
# CHECK: error: dylib {{.*}}libnoid.dylib missing LC_ID_DYLIB load command
.text
.globl _main
_main:
mov $0, %rax
ret

lld/test/MachO/no-such-file.s

  • This file was moved to lld/test/MachO/invalid/no-such-file.s.
lld/test/MachO/invalid/no-id-dylink.yaml