diff options
| author | Dave Lee <davelee.com@gmail.com> | 2017-11-16 17:46:11 +0000 |
|---|---|---|
| committer | Dave Lee <davelee.com@gmail.com> | 2017-11-16 17:46:11 +0000 |
| commit | 37d08700eb7f0b1572ef966865dcf876f9300287 (patch) | |
| tree | 53b7a28fea3aad4deb8fdd4d8c322237e3378209 | |
| parent | 324f14167aa2475f291cdf4aa229686314c91709 (diff) | |
Allow empty mappings for optional YAML input
Summary:
This change fixes a bug where `obj2yaml` can in some cases produce YAML that
causes `yaml2obj` to error.
The ELF YAML document structure has a `Sections` mapping, which contains three
mappings, all of which are optional: `Local`, `Global`, and `Weak.` Any one of
these can be missing, but if all three are missing, then `yaml2obj` errors. This
change allows YAML input for cases like this one.
I have tested this with check-llvm and check-lld, and all tests passed.
This change is the result of test failures while working on D39582, which
introduces a `DynamicSymbols` mapping, which will be empty at times.
Reviewers: compnerd, jakehehrlich, silvas, kledzik, mehdi_amini, pcc
Reviewed By: compnerd
Subscribers: silvas, llvm-commits
Differential Revision: https://reviews.llvm.org/D39908
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318428 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Support/YAMLTraits.cpp | 3 | ||||
| -rw-r--r-- | test/tools/yaml2obj/empty-symbols.yaml | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/Support/YAMLTraits.cpp b/lib/Support/YAMLTraits.cpp index 75a2224a772..a80adfda830 100644 --- a/lib/Support/YAMLTraits.cpp +++ b/lib/Support/YAMLTraits.cpp @@ -160,7 +160,8 @@ bool Input::preflightKey(const char *Key, bool Required, bool, bool &UseDefault, MapHNode *MN = dyn_cast<MapHNode>(CurrentNode); if (!MN) { - setError(CurrentNode, "not a mapping"); + if (Required || !isa<EmptyHNode>(CurrentNode)) + setError(CurrentNode, "not a mapping"); return false; } MN->ValidKeys.push_back(Key); diff --git a/test/tools/yaml2obj/empty-symbols.yaml b/test/tools/yaml2obj/empty-symbols.yaml new file mode 100644 index 00000000000..1ba37add3c0 --- /dev/null +++ b/test/tools/yaml2obj/empty-symbols.yaml @@ -0,0 +1,10 @@ +# Ensure yaml2obj doesn't error on empty optional mappings, such as Symbols +# RUN: yaml2obj %s -o %t + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Machine: EM_X86_64 +Symbols: |