[llvm] e64f7bf - Revert "[Object][MachO] Rewrite macho-invalid-fat-arch-size into YAML"

[Steven Wu via llvm-commits]

Author: Steven Wu
Date: 2019-11-05T09:34:26-08:00
New Revision: e64f7bfefe4f1e8b1d4fb4af8a1633f06b56640a

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

LOG: Revert "[Object][MachO] Rewrite macho-invalid-fat-arch-size into YAML"

The invalid binary trying to construct triggers an assertion.

Added: 
    llvm/test/Object/Inputs/macho-invalid-fat-arch-size

Modified: 
    llvm/test/Object/macho-invalid.test

Removed: 
    llvm/test/Object/Inputs/macho-invalid-fat-arch-size.yaml


################################################################################
diff  --git a/llvm/test/Object/Inputs/macho-invalid-fat-arch-size b/llvm/test/Object/Inputs/macho-invalid-fat-arch-size
new file mode 100644
index 000000000000..dfd154c88e38
Binary files /dev/null and b/llvm/test/Object/Inputs/macho-invalid-fat-arch-size 
diff er

diff  --git a/llvm/test/Object/Inputs/macho-invalid-fat-arch-size.yaml b/llvm/test/Object/Inputs/macho-invalid-fat-arch-size.yaml
deleted file mode 100644
index f7bf00d7c13e..000000000000
--- a/llvm/test/Object/Inputs/macho-invalid-fat-arch-size.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
---- !fat-mach-o
-FatHeader:       
-  magic:           0xCAFEBABE
-  nfat_arch:       1
-FatArchs:        
-  - cputype:         0x00000007
-    cpusubtype:      0x00000003
-    offset:          0x000000000000020
-    size:            32
-    align:           2
-Slices:
-...

diff  --git a/llvm/test/Object/macho-invalid.test b/llvm/test/Object/macho-invalid.test
index 2206c678105b..1cbd7469d736 100644
--- a/llvm/test/Object/macho-invalid.test
+++ b/llvm/test/Object/macho-invalid.test
@@ -491,8 +491,8 @@ INVALID-EXPORT-OVERLAP: macho-invalid-export-overlap': truncated or malformed ob
 RUN: not llvm-objdump --macho --universal-headers %p/Inputs/macho-invalid-fat-header 2>&1 | FileCheck -check-prefix INVALID-FAT-HEADER %s
 INVALID-FAT-HEADER: macho-invalid-fat-header': truncated or malformed fat file (contains zero architecture types)
 
-RUN: yaml2obj %p/Inputs/macho-invalid-fat-arch-size.yaml -o - | not llvm-objdump --macho --universal-headers - 2>&1 | FileCheck -check-prefix INVALID-FAT-ARCH-SIZE %s
-INVALID-FAT-ARCH-SIZE: '-': truncated or malformed fat file (offset plus size of cputype (7) cpusubtype (3) extends past the end of the file)
+RUN: not llvm-objdump --macho --universal-headers %p/Inputs/macho-invalid-fat-arch-size 2>&1 | FileCheck -check-prefix INVALID-FAT-ARCH-SIZE %s
+INVALID-FAT-ARCH-SIZE: macho-invalid-fat-arch-size': truncated or malformed fat file (offset plus size of cputype (7) cpusubtype (3) extends past the end of the file)
 
 RUN: not llvm-objdump --macho --universal-headers %p/Inputs/macho-invalid-fat-arch-bigalign 2>&1 | FileCheck -check-prefix INVALID-FAT-ARCH-BIGALIGN %s
 INVALID-FAT-ARCH-BIGALIGN: macho-invalid-fat-arch-bigalign': truncated or malformed fat file (align (2^212) too large for cputype (7) cpusubtype (3) (maximum 2^15))