This is an archive of the discontinued LLVM Phabricator instance.

Differential D134562

[objdump] Fix typo in error message.
ClosedPublic

Authored by drodriguez on Sep 23 2022, 1:26 PM.

Details

Reviewers
enderby
ributzka
pete
jhenderson
MaskRay
Commits
rG74150a0afa2d: [objdump] Fix typo in error message.
Summary

Change "inconsistant" for "inconsistent" in the message, the file name
and the test output.

Diff Detail

Event Timeline

drodriguez created this revision.Sep 23 2022, 1:26 PM
Herald added a reviewer: jhenderson. · View Herald TranscriptSep 23 2022, 1:26 PM
Herald added a reviewer: MaskRay. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: hiraditya. · View Herald Transcript
drodriguez requested review of this revision.Sep 23 2022, 1:26 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 23 2022, 1:26 PM
Herald added subscribers: llvm-commits, StephenFan. · View Herald Transcript
MaskRay accepted this revision.Sep 23 2022, 1:36 PM

LGTM.

This revision is now accepted and ready to land.Sep 23 2022, 1:36 PM
pete accepted this revision.Sep 23 2022, 1:36 PM
Harbormaster completed remote builds in B188466: Diff 462579.Sep 23 2022, 3:07 PM
Closed by commit rG74150a0afa2d: [objdump] Fix typo in error message. (authored by drodriguez). · Explain WhySep 23 2022, 4:28 PM
This revision was automatically updated to reflect the committed changes.
drodriguez added a commit: rG74150a0afa2d: [objdump] Fix typo in error message..

Revision Contents

PathSize
llvm/
lib/
Object/
2 lines
test/
tools/
llvm-objdump/
MachO/
Inputs/
macho-inconsistent-export
macho-inconsistant-export
4 lines

Diff 462612

llvm/lib/Object/MachOObjectFile.cpp

Show First 20 Lines • Show All 3,085 Lines • ▼ Show 20 Lines if (State.Flags & MachO::EXPORT_SYMBOL_FLAGS_REEXPORT) {
Twine::utohexstr(offset)); Twine::utohexstr(offset));
moveToEnd(); moveToEnd();
return; return;
} }
} }
} }
if(ExportStart + ExportInfoSize != State.Current) { if(ExportStart + ExportInfoSize != State.Current) {
*E = malformedError( *E = malformedError(
"inconsistant export info size: 0x" + "inconsistent export info size: 0x" +
Twine::utohexstr(ExportInfoSize) + " where actual size was: 0x" + Twine::utohexstr(ExportInfoSize) + " where actual size was: 0x" +
Twine::utohexstr(State.Current - ExportStart) + Twine::utohexstr(State.Current - ExportStart) +
" in export trie data at node: 0x" + Twine::utohexstr(offset)); " in export trie data at node: 0x" + Twine::utohexstr(offset));
moveToEnd(); moveToEnd();
return; return;
} }
} }
State.ChildCount = *Children; State.ChildCount = *Children;
▲ Show 20 Lines • Show All 2,273 Lines • Show Last 20 Lines

llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistant-export

  • This file was moved to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistent-export.

llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistent-export

  • This file was moved from llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistant-export.
The contents of this file were not changed.

llvm/test/tools/llvm-objdump/MachO/bad-trie.test

Show All 25 Lines
NOT_EXPORT_NODE: macho-trie-not-export-node': truncated or malformed object (node is not an export node in export trie data at node: 0x5a) NOT_EXPORT_NODE: macho-trie-not-export-node': truncated or malformed object (node is not an export node in export trie data at node: 0x5a)
RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-node-loop 2>&1 | FileCheck --check-prefix LOOP_OF_CHILDERN %s RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-node-loop 2>&1 | FileCheck --check-prefix LOOP_OF_CHILDERN %s
LOOP_OF_CHILDERN: macho-trie-node-loop': truncated or malformed object (loop in childern in export trie data at node: 0x42 back to node: 0x5) LOOP_OF_CHILDERN: macho-trie-node-loop': truncated or malformed object (loop in childern in export trie data at node: 0x42 back to node: 0x5)
RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-library-ordinal 2>&1 | FileCheck --check-prefix BAD_LIBRARY_ORDINAL %s RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-library-ordinal 2>&1 | FileCheck --check-prefix BAD_LIBRARY_ORDINAL %s
BAD_LIBRARY_ORDINAL: macho-trie-bad-library-ordinal': truncated or malformed object (bad library ordinal: 69 (max 3) in export trie data at node: 0x33) BAD_LIBRARY_ORDINAL: macho-trie-bad-library-ordinal': truncated or malformed object (bad library ordinal: 69 (max 3) in export trie data at node: 0x33)
RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-inconsistant-export 2>&1 | FileCheck --check-prefix INCONSISTANT_EXPORT_SIZE %s RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-inconsistent-export 2>&1 | FileCheck --check-prefix INCONSISTENT_EXPORT_SIZE %s
INCONSISTANT_EXPORT_SIZE: macho-inconsistant-export': truncated or malformed object (inconsistant export info size: 0x9 where actual size was: 0x5 in export trie data at node: 0x53) INCONSISTENT_EXPORT_SIZE: macho-inconsistent-export': truncated or malformed object (inconsistent export info size: 0x9 where actual size was: 0x5 in export trie data at node: 0x53)