From dbe13110f59f48b4dbb7552b3ac2935acdeece7f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 14 Apr 2012 14:01:31 +0000 Subject: Vendor import of clang trunk r154661: http://llvm.org/svn/llvm-project/cfe/trunk@r154661 --- test/Sema/static-init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/Sema/static-init.c') diff --git a/test/Sema/static-init.c b/test/Sema/static-init.c index b4de92713b88..bbf9038ef381 100644 --- a/test/Sema/static-init.c +++ b/test/Sema/static-init.c @@ -15,9 +15,10 @@ union bar { }; struct foo { - unsigned ptr; + short ptr; }; union bar u[1]; -struct foo x = {(intptr_t) u}; // no-error +struct foo x = {(intptr_t) u}; // expected-error {{initializer element is not a compile-time constant}} struct foo y = {(char) u}; // expected-error {{initializer element is not a compile-time constant}} +intptr_t z = (intptr_t) u; // no-error -- cgit v1.3