[llvm-branch-commits] [libcxx] r324345 - Merging r324153:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb  6 05:22:33 2018
New Revision: 324345

URL: http://llvm.org/viewvc/llvm-project?rev=324345&view=rev
Log:
Merging r324153:
------------------------------------------------------------------------
r324153 | ericwf | 2018-02-02 23:39:59 +0100 (Fri, 02 Feb 2018) | 6 lines

Fix has_unique_object_representation after Clang commit r324134.

Clang previously reported an empty union as having a unique object
representation. This was incorrect and was fixed in a recent Clang commit.

This patch fixes the libc++ tests.
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_60/   (props changed)
    libcxx/branches/release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp

Propchange: libcxx/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 05:22:33 2018
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:321963
+/libcxx/trunk:321963,324153

Modified: libcxx/branches/release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp?rev=324345&r1=324344&r2=324345&view=diff
==============================================================================
--- libcxx/branches/release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp (original)
+++ libcxx/branches/release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp Tue Feb  6 05:22:33 2018
@@ -55,7 +55,8 @@ class NotEmpty
     virtual ~NotEmpty();
 };
 
-union Union {};
+union EmptyUnion {};
+struct NonEmptyUnion {int x; unsigned y;};
 
 struct bit_zero
 {
@@ -84,6 +85,7 @@ int main()
 {
     test_has_not_has_unique_object_representations<void>();
     test_has_not_has_unique_object_representations<Empty>();
+    test_has_not_has_unique_object_representations<EmptyUnion>();
     test_has_not_has_unique_object_representations<NotEmpty>();
     test_has_not_has_unique_object_representations<bit_zero>();
     test_has_not_has_unique_object_representations<Abstract>();
@@ -97,7 +99,7 @@ int main()
 
 
     test_has_unique_object_representations<unsigned>();
-    test_has_unique_object_representations<Union>();
+    test_has_unique_object_representations<NonEmptyUnion>();
     test_has_unique_object_representations<char[3]>();
     test_has_unique_object_representations<char[]>();