2 files changed, 0 insertions, 30 deletions
diff --git a/llvm/include/llvm/Support/YAMLTraits.h b/llvm/include/llvm/Support/YAMLTraits.h
index e06830c37cb..c04294a5e87 100644
--- a/llvm/include/llvm/Support/YAMLTraits.h
+++ b/llvm/include/llvm/Support/YAMLTraits.h
@@ -647,8 +647,6 @@ private:
     if ( this->preflightKey(Key, Required, false, UseDefault, SaveInfo) ) {
       yamlize(*this, Val, Required);
       this->postflightKey(SaveInfo);
-    } else if (UseDefault) {
-      Val = T();
     }
   }
 
diff --git a/llvm/unittests/Support/YAMLIOTest.cpp b/llvm/unittests/Support/YAMLIOTest.cpp
index 0c791b7a020..e7affa1698d 100644
--- a/llvm/unittests/Support/YAMLIOTest.cpp
+++ b/llvm/unittests/Support/YAMLIOTest.cpp
@@ -68,21 +68,6 @@ namespace yaml {
 }
 }
 
-struct FooBarOptional {
-  int Foo;
-  int Bar;
-};
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<FooBarOptional> {
-  static void mapping(IO &YamlIO, FooBarOptional &Obj) {
-    YamlIO.mapRequired("foo", Obj.Foo);
-    YamlIO.mapOptional("bar", Obj.Bar);
-  }
-};
-}
-}
 
 //
 // Test the reading of a yaml mapping
@@ -108,19 +93,6 @@ TEST(YAMLIO, TestMapRead) {
   }
 }
 
-TEST(YAMLIO, TestMapReadOptional) {
-  FooBarOptional Doc;
-  Doc.Bar = 42;
-  {
-    Input In("---\nfoo:  3\n...\n");
-    In >> Doc;
-
-    EXPECT_FALSE(In.error());
-    EXPECT_EQ(Doc.Foo, 3);
-    EXPECT_EQ(Doc.Bar, 0);
-  }
-}
-
 TEST(YAMLIO, TestMalformedMapRead) {
   FooBar doc;
   Input yin("{foo: 3; bar: 5}", nullptr, suppressErrorMessages);