From a486dcaf360f13deb0a5c485a2b4a4e4652392e8 Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Mon, 2 May 2016 20:28:12 +0000 Subject: =?UTF-8?q?Thread=20Expected<...>=20up=20from=20libObject=E2=80=99?= =?UTF-8?q?s=20getType()=20for=20symbols=20to=20allow=20llvm-objdump=20to?= =?UTF-8?q?=20produce=20a=20good=20error=20message.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Produce another specific error message for a malformed Mach-O file when a symbol’s section index is more than the number of sections. The existing test case in test/Object/macho-invalid.test for macho-invalid-section-index-getSectionRawName now reports the error with the message indicating that a symbol at a specific index has a bad section index and that bad section index value. Again converting interfaces to Expected<> from ErrorOr<> does involve touching a number of places. Where the existing code reported the error with a string message or an error code it was converted to do the same. Also there some were bugs in the existing code that did not deal with the old ErrorOr<> return values.  So now with Expected<> since they must be checked and the error handled, I added a TODO and a comment: "// TODO: Actually report errors helpfully" and a call something like consumeError(NameOrErr.takeError()) so the buggy code will not crash since needed to deal with the Error. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268298 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Object/macho-invalid.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/Object/macho-invalid.test') diff --git a/test/Object/macho-invalid.test b/test/Object/macho-invalid.test index 5d83ce762fc..038f5a840f9 100644 --- a/test/Object/macho-invalid.test +++ b/test/Object/macho-invalid.test @@ -55,7 +55,7 @@ RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SYMBOL-SEC-pax %s INVALID-SECTION-IDX-SYMBOL-SEC-pax: 0000000100000000 0f 42 0010 00000065 __mh_execute_header RUN: not llvm-objdump -t %p/Inputs/macho-invalid-section-index-getSectionRawName 2>&1 \ RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SYMBOL-SEC-objdump %s -INVALID-SECTION-IDX-SYMBOL-SEC-objdump: Invalid data was encountered while parsing the file. +INVALID-SECTION-IDX-SYMBOL-SEC-objdump: truncated or malformed object (bad section index: 66 for symbol at index 8) RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-header 2>&1 | FileCheck -check-prefix INVALID-HEADER %s INVALID-HEADER: The file was not recognized as a valid object file -- cgit v1.2.3