diff --git a/libcxx/include/__debug b/libcxx/include/__debug
index e0cef09ee0a7..337793dc77fb 100644
--- a/libcxx/include/__debug
+++ b/libcxx/include/__debug
@@ -26,7 +26,7 @@
 
 #if _LIBCPP_DEBUG_LEVEL >= 1 && !defined(_LIBCPP_ASSERT)
 # define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : \
-  _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info{__FILE__, __LINE__, #x, m}))
+  _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
 #endif
 
 #if _LIBCPP_DEBUG_LEVEL >= 2
@@ -53,6 +53,9 @@ class _LIBCPP_EXCEPTION_ABI __libcpp_debug_exception;
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 struct _LIBCPP_TYPE_VIS_ONLY __libcpp_debug_info {
+  _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
+  __libcpp_debug_info(const char* __f, int __l, const char* __p, const char* __m)
+    : __file_(__f), __line_(__l), __pred_(__p), __msg_(__m) {}
   const char* __file_;
   int __line_;
   const char* __pred_;
diff --git a/libcxx/test/libcxx/debug/debug_throw.pass.cpp b/libcxx/test/libcxx/debug/debug_throw.pass.cpp
index 109f9e93b03b..bc5625c60093 100644
--- a/libcxx/test/libcxx/debug/debug_throw.pass.cpp
+++ b/libcxx/test/libcxx/debug/debug_throw.pass.cpp
@@ -29,8 +29,8 @@ int main()
   }
   {
     // test that the libc++ exception type derives from std::exception
-    static_assert(std::is_base_of<std::exception,
+    static_assert((std::is_base_of<std::exception,
                                   std::__libcpp_debug_exception
-                  >::value, "must be an exception");
+                  >::value), "must be an exception");
   }
 }