diff options
| -rw-r--r-- | llvm/lib/Support/YAMLTraits.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/tools/yaml2obj/empty-symbols.yaml | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/llvm/lib/Support/YAMLTraits.cpp b/llvm/lib/Support/YAMLTraits.cpp index 75a2224a772..a80adfda830 100644 --- a/llvm/lib/Support/YAMLTraits.cpp +++ b/llvm/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/llvm/test/tools/yaml2obj/empty-symbols.yaml b/llvm/test/tools/yaml2obj/empty-symbols.yaml new file mode 100644 index 00000000000..1ba37add3c0 --- /dev/null +++ b/llvm/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: |
