From 599bf43e564603aa3f99321fedd78ff4f85f78e8 Mon Sep 17 00:00:00 2001
From: JF Bastien <jfbastien@apple.com>
Date: Fri, 25 May 2018 20:43:57 +0000
Subject: [PATCH] Fix optional deduction guide test breakage

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@333308 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../optional.object/optional.object.ctor/deduct.fail.cpp        | 2 +-
 .../optional.object/optional.object.ctor/deduct.pass.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
index 4ebafad6b..5bbb77d46 100644
--- a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
+++ b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
@@ -28,7 +28,7 @@ int main()
 //  Test the implicit deduction guides
     {
 //  optional()
-    std::optional opt;   // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'optional'}}
+    std::optional opt;   // expected-error {{declaration of variable 'opt' with deduced type 'std::optional' requires an initializer}}
     }
 
     {
diff --git a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
index 012cfa466..3a6b3dcbb 100644
--- a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
+++ b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
@@ -45,7 +45,7 @@ int main()
 //  optional(const optional &);
     std::optional<char> source('A');
     std::optional opt(source);
-    static_assert(std::is_same_v<decltype(opt), std::optional<char>>, "");
+    static_assert(std::is_same_v<decltype(opt), std::optional<std::optional<char>>>, "");
     assert(static_cast<bool>(opt) == static_cast<bool>(source));
     assert(*opt == *source);
     }