From bfb6072d84fbd6169d57afe9d812de1abca7b5d7 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 3 Aug 2016 18:44:32 +0000 Subject: Revert "More fixes to get good error messages for bad archives." This reverts commit r277540. It breaks the build with: ../lib/Object/Archive.cpp:264:41: error: return type of out-of-line definition of 'llvm::object::ArchiveMemberHeader::getUID' differs from that in the declaration Expected ArchiveMemberHeader::getUID() const { ~~~~~~~~~~~~~~~~~~ ^ include/llvm/Object/Archive.h:53:12: note: previous declaration is here unsigned getUID() const; ~~~~~~~~ ^ llvm-svn: 277627 --- llvm/test/tools/llvm-objdump/Inputs/libbogus11.a | 10 -------- llvm/test/tools/llvm-objdump/Inputs/libbogus12.a | 10 -------- llvm/test/tools/llvm-objdump/Inputs/libbogus13.a | 10 -------- llvm/test/tools/llvm-objdump/Inputs/libbogus14.a | 10 -------- .../tools/llvm-objdump/malformed-archives.test | 28 ---------------------- 5 files changed, 68 deletions(-) delete mode 100644 llvm/test/tools/llvm-objdump/Inputs/libbogus11.a delete mode 100644 llvm/test/tools/llvm-objdump/Inputs/libbogus12.a delete mode 100644 llvm/test/tools/llvm-objdump/Inputs/libbogus13.a delete mode 100644 llvm/test/tools/llvm-objdump/Inputs/libbogus14.a (limited to 'llvm/test/tools/llvm-objdump') diff --git a/llvm/test/tools/llvm-objdump/Inputs/libbogus11.a b/llvm/test/tools/llvm-objdump/Inputs/libbogus11.a deleted file mode 100644 index 99a709da8d6..00000000000 --- a/llvm/test/tools/llvm-objdump/Inputs/libbogus11.a +++ /dev/null @@ -1,10 +0,0 @@ -! -hello.c 1444941273 ~97& 0 100644 102 ` -#include -#include -int -main() -{ - printf("Hello World\n"); - return EXIT_SUCCESS; -} diff --git a/llvm/test/tools/llvm-objdump/Inputs/libbogus12.a b/llvm/test/tools/llvm-objdump/Inputs/libbogus12.a deleted file mode 100644 index fab3cfc4069..00000000000 --- a/llvm/test/tools/llvm-objdump/Inputs/libbogus12.a +++ /dev/null @@ -1,10 +0,0 @@ -! -hello.c 1444941273 124 #55! 100644 102 ` -#include -#include -int -main() -{ - printf("Hello World\n"); - return EXIT_SUCCESS; -} diff --git a/llvm/test/tools/llvm-objdump/Inputs/libbogus13.a b/llvm/test/tools/llvm-objdump/Inputs/libbogus13.a deleted file mode 100644 index f6f80829186..00000000000 --- a/llvm/test/tools/llvm-objdump/Inputs/libbogus13.a +++ /dev/null @@ -1,10 +0,0 @@ -! -hello.c 1444941273 124 0 Feed 102 ` -#include -#include -int -main() -{ - printf("Hello World\n"); - return EXIT_SUCCESS; -} diff --git a/llvm/test/tools/llvm-objdump/Inputs/libbogus14.a b/llvm/test/tools/llvm-objdump/Inputs/libbogus14.a deleted file mode 100644 index 003cc986fc9..00000000000 --- a/llvm/test/tools/llvm-objdump/Inputs/libbogus14.a +++ /dev/null @@ -1,10 +0,0 @@ -! -hello.c 1foobar273 124 0 100644 102 ` -#include -#include -int -main() -{ - printf("Hello World\n"); - return EXIT_SUCCESS; -} diff --git a/llvm/test/tools/llvm-objdump/malformed-archives.test b/llvm/test/tools/llvm-objdump/malformed-archives.test index b8ba48d838e..a9733d5939d 100644 --- a/llvm/test/tools/llvm-objdump/malformed-archives.test +++ b/llvm/test/tools/llvm-objdump/malformed-archives.test @@ -58,31 +58,3 @@ # RUN: 2>&1 | FileCheck -check-prefix=bogus10 %s # bogus10: libbogus10.a(???) truncated or malformed archive (long name offset 507 past the end of the string table for archive member header at offset 94) - -# RUN: not llvm-objdump -macho -archive-headers \ -# RUN: %p/Inputs/libbogus11.a \ -# RUN: 2>&1 | FileCheck -check-prefix=bogus11 %s - -# bogus11: libbogus11.a(hello.c) truncated or malformed archive (characters in UID field in archive header are not all decimal numbers: '~97&' for the archive member header at offset 8) - -# RUN: not llvm-objdump -macho -archive-headers \ -# RUN: %p/Inputs/libbogus12.a \ -# RUN: 2>&1 | FileCheck -check-prefix=bogus12 %s - -# bogus12: libbogus12.a(hello.c) truncated or malformed archive (characters in GID field in archive header are not all decimal numbers: '#55!' for the archive member header at offset 8) - -# RUN: not llvm-objdump -macho -archive-headers \ -# RUN: %p/Inputs/libbogus13.a \ -# RUN: 2>&1 | FileCheck -check-prefix=bogus13 %s - -# bogus13: libbogus13.a(hello.c) truncated or malformed archive (characters in AccessMode field in archive header are not all decimal numbers: 'Feed' for the archive member header at offset 8) - -# RUN: llvm-objdump -macho -archive-headers %p/Inputs/libbogus14.a \ -# RUN: 2>&1 | FileCheck -check-prefix=bogus14 %s - -# bogus14: -rw-r--r--124/0 102 (date: "1foobar273" contains non-decimal chars) hello.c - -# RUN: not llvm-ar tv %p/Inputs/libbogus14.a \ -# RUN: 2>&1 | FileCheck -check-prefix=bogus14a %s - -# bogus14a: truncated or malformed archive (characters in LastModified field in archive header are not all decimal numbers: '1foobar273' for the archive member header at offset 8) -- cgit v1.2.3