[libcxx] r324153 - Fix has_unique_object_representation after Clang commit r324134.

[Hans Wennborg via cfe-commits]

Merged to 6.0 in r324345.

On Fri, Feb 2, 2018 at 11:39 PM, Eric Fiselier via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
> Author: ericwf
> Date: Fri Feb  2 14:39:59 2018
> New Revision: 324153
>
> URL: http://llvm.org/viewvc/llvm-project?rev=324153&view=rev
> Log:
> 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/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp
>
> Modified: libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp
> URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp?rev=324153&r1=324152&r2=324153&view=diff
> ==============================================================================
> --- libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp (original)
> +++ libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp Fri Feb  2 14:39:59 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[]>();
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits