From 3907ca9d61b2acad5b641e2c3d1bb2665d8b614b Mon Sep 17 00:00:00 2001 From: George Rimar Date: Wed, 20 Sep 2017 10:24:37 +0000 Subject: [PATCH] Revert r313746 "[yaml2obj] - Don't crash on invalid document." It broke BB: http://lab.llvm.org:8011/builders/llvm-hexagon-elf/builds/9781 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313748 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/YAMLTraits.h | 4 ++-- test/Object/yaml2obj-invalid.yaml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 test/Object/yaml2obj-invalid.yaml diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h index 5f6f0493e28..71fdf47f197 100644 --- a/include/llvm/Support/YAMLTraits.h +++ b/include/llvm/Support/YAMLTraits.h @@ -1418,8 +1418,8 @@ inline typename std::enable_if::value, Input &>::type operator>>(Input &yin, T &docMap) { EmptyContext Ctx; - if (yin.setCurrentDocument()) - yamlize(yin, docMap, true, Ctx); + yin.setCurrentDocument(); + yamlize(yin, docMap, true, Ctx); return yin; } diff --git a/test/Object/yaml2obj-invalid.yaml b/test/Object/yaml2obj-invalid.yaml deleted file mode 100644 index d1f4fa26d82..00000000000 --- a/test/Object/yaml2obj-invalid.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# RUN: not yaml2obj %s 2>&1 | FileCheck %s -# CHECK: Unknown document type! -- 2.50.1