diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-20 04:31:55 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-20 04:31:55 +0000 |
| commit | 56f3cc6a5ffff81f20d89796b9fbd6710aede8c3 (patch) | |
| tree | 53ea139fe52ccad2a95e7bcdab61f75b0c8abbec | |
| parent | 820cbbb668ff6a38a8724dbe6f20242e14f1900a (diff) | |
revert r101863, whcih is causing Sema/altivec-init.c to fail on a ton
of buildbots with:
error: 'error' diagnostics expected but not seen:
Line 9: too few elements in vector initialization (expected 8 elements, have 2)
1 warning and 1 error generated.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101864 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 2 | ||||
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | test/Parser/altivec.c | 2 | ||||
| -rw-r--r-- | test/Parser/cxx-altivec.cpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 981d5831b0..7929b588b6 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -886,7 +886,7 @@ void InitListChecker::CheckVectorType(const InitializedEntity &Entity, // OpenCL & AltiVec require all elements to be initialized. if (numEltsInit != maxElements) - if (SemaRef.getLangOptions().OpenCL) + if (SemaRef.getLangOptions().OpenCL || SemaRef.getLangOptions().AltiVec) SemaRef.Diag(IList->getSourceRange().getBegin(), diag::err_vector_incorrect_num_initializers) << (numEltsInit < maxElements) << maxElements << numEltsInit; diff --git a/test/Makefile b/test/Makefile index e9d89454b8..40170e42ff 100644 --- a/test/Makefile +++ b/test/Makefile @@ -16,9 +16,9 @@ TESTDIRS += $(EXTRA_TESTDIRS) ifndef TESTARGS ifdef VERBOSE -TESTARGS = -v +TESTARGS = -v -j16 else -TESTARGS = -s -v +TESTARGS = -s -v -j16 endif endif diff --git a/test/Parser/altivec.c b/test/Parser/altivec.c index ed144573fc..a3e8183f35 100644 --- a/test/Parser/altivec.c +++ b/test/Parser/altivec.c @@ -40,8 +40,6 @@ vector int f__r(); void f_a(vector int a); void f_a2(int b, vector int a); -vector int v = (vector int)(-1); - // These should have warnings. __vector long vv_l; // expected-warning {{Use of 'long' with '__vector' is deprecated}} __vector signed long vv_sl; // expected-warning {{Use of 'long' with '__vector' is deprecated}} diff --git a/test/Parser/cxx-altivec.cpp b/test/Parser/cxx-altivec.cpp index 66d4f3263b..7f7a9d2df6 100644 --- a/test/Parser/cxx-altivec.cpp +++ b/test/Parser/cxx-altivec.cpp @@ -41,8 +41,6 @@ vector int f__r(); void f_a(vector int a); void f_a2(int b, vector int a); -vector int v = (vector int)(-1); - // These should have warnings. __vector long vv_l; // expected-warning {{Use of 'long' with '__vector' is deprecated}} __vector signed long vv_sl; // expected-warning {{Use of 'long' with '__vector' is deprecated}} |