llvm · Apr 16, 2017
diff --git a/‎libcxx/include/memory
+526-351 b/‎libcxx/include/memory
+526-351
diff --git a/‎libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
+5-4 b/‎libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
+5-4
@@ -82,31 +82,32 @@ void test_sfinae() {
     static_assert(!std::is_assignable<U, U&>::value, "");
     static_assert(!std::is_assignable<U, const U&>::value, "");
     static_assert(!std::is_assignable<U, const U&&>::value, "");
-    static_assert(std::is_assignable<U, U&&>::value, "");
+    static_assert(std::is_nothrow_assignable<U, U&&>::value, "");
   }
   {
     typedef std::unique_ptr<VT, GenericDeleter> U;
     static_assert(!std::is_assignable<U, U&>::value, "");
     static_assert(!std::is_assignable<U, const U&>::value, "");
     static_assert(!std::is_assignable<U, const U&&>::value, "");
-    static_assert(std::is_assignable<U, U&&>::value, "");
+    static_assert(std::is_nothrow_assignable<U, U&&>::value, "");
   }
   {
     typedef std::unique_ptr<VT, NCDeleter<VT>&> U;
     static_assert(!std::is_assignable<U, U&>::value, "");
     static_assert(!std::is_assignable<U, const U&>::value, "");
     static_assert(!std::is_assignable<U, const U&&>::value, "");
-    static_assert(std::is_assignable<U, U&&>::value, "");
+    static_assert(std::is_nothrow_assignable<U, U&&>::value, "");
   }
   {
     typedef std::unique_ptr<VT, const NCDeleter<VT>&> U;
     static_assert(!std::is_assignable<U, U&>::value, "");
     static_assert(!std::is_assignable<U, const U&>::value, "");
     static_assert(!std::is_assignable<U, const U&&>::value, "");
-    static_assert(std::is_assignable<U, U&&>::value, "");
+    static_assert(std::is_nothrow_assignable<U, U&&>::value, "");
   }
 }
 
+
 int main() {
   {
     test_basic</*IsArray*/ false>();
Original file line number	Diff line number	Diff line change
`@@ -82,31 +82,32 @@ void test_sfinae() {`
`82`	`82`	`static_assert(!std::is_assignable<U, U&>::value, "");`
`83`	`83`	`static_assert(!std::is_assignable<U, const U&>::value, "");`
`84`	`84`	`static_assert(!std::is_assignable<U, const U&&>::value, "");`
`85`		`- static_assert(std::is_assignable<U, U&&>::value, "");`
	`85`	`+ static_assert(std::is_nothrow_assignable<U, U&&>::value, "");`
`86`	`86`	`}`
`87`	`87`	`{`
`88`	`88`	`typedef std::unique_ptr<VT, GenericDeleter> U;`
`89`	`89`	`static_assert(!std::is_assignable<U, U&>::value, "");`
`90`	`90`	`static_assert(!std::is_assignable<U, const U&>::value, "");`
`91`	`91`	`static_assert(!std::is_assignable<U, const U&&>::value, "");`
`92`		`- static_assert(std::is_assignable<U, U&&>::value, "");`
	`92`	`+ static_assert(std::is_nothrow_assignable<U, U&&>::value, "");`
`93`	`93`	`}`
`94`	`94`	`{`
`95`	`95`	`typedef std::unique_ptr<VT, NCDeleter<VT>&> U;`
`96`	`96`	`static_assert(!std::is_assignable<U, U&>::value, "");`
`97`	`97`	`static_assert(!std::is_assignable<U, const U&>::value, "");`
`98`	`98`	`static_assert(!std::is_assignable<U, const U&&>::value, "");`
`99`		`- static_assert(std::is_assignable<U, U&&>::value, "");`
	`99`	`+ static_assert(std::is_nothrow_assignable<U, U&&>::value, "");`
`100`	`100`	`}`
`101`	`101`	`{`
`102`	`102`	`typedef std::unique_ptr<VT, const NCDeleter<VT>&> U;`
`103`	`103`	`static_assert(!std::is_assignable<U, U&>::value, "");`
`104`	`104`	`static_assert(!std::is_assignable<U, const U&>::value, "");`
`105`	`105`	`static_assert(!std::is_assignable<U, const U&&>::value, "");`
`106`		`- static_assert(std::is_assignable<U, U&&>::value, "");`
	`106`	`+ static_assert(std::is_nothrow_assignable<U, U&&>::value, "");`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
	`110`	`+`
`110`	`111`	`int main() {`
`111`	`112`	`{`
`112`	`113`	`test_basic</IsArray/ false>();`