[OpenCL] Restrict swizzle length check to OpenCL mode

[bruno]

Summary

Change behavior introduced in r298369 and only error out on vector component invalid length access on OpenCL mode.

[Anastasia]

test/SemaOpenCL/vector_swizzle_length.cl

6

Even though this works in Clang, ideally OpenCL vector literal is with parenthesis (see s6.1.6).

11

I am not sure it's good idea to test C mode here since this is intended for OpenCL only functionality. I think it might be better to separate C functionality and keep under regular Sema tests. We could keep the same test name to be able to identify similar functionality.

[bruno]

test/SemaOpenCL/vector_swizzle_length.cl

6

Ok. I changed this to avoid warnings in C mode. Gonna change it back,

11

Ok!

[bruno]

Update patch after Anastasia's suggestions

[Anastasia]

LGTM!

test/SemaOpenCL/vector_swizzle_length.cl

6

Can you undo this change please before committing. Thanks!

lib/Sema/SemaExprMember.cpp

while (*compStr) {
       if (!vecType->isAccessorWithinNumElements(*compStr++, HexSwizzle)) {
         S.Diag(OpLoc, diag::err_ext_vector_component_exceeds_length)
           << baseType << SourceRange(CompLoc);
         return QualType();
       }
     }
   }
 
-  if (!HalvingSwizzle) {
+  // OpenCL mode requires swizzle length to be in accordance with accepted
+  // sizes. Clang however supports arbitrary lengths for other languages.
+  if (S.getLangOpts().OpenCL && !HalvingSwizzle) {
     unsigned SwizzleLength = CompName->getLength();
 
     if (HexSwizzle)
       SwizzleLength--;
 
     if (IsValidOpenCLComponentSwizzleLength(SwizzleLength) == false) {
       S.Diag(OpLoc, diag::err_opencl_ext_vector_component_invalid_length)
         << SwizzleLength << SourceRange(CompLoc);

test/Sema/vector_swizzle_length.c

+// RUN: %clang_cc1 -x c %s -verify -pedantic -fsyntax-only
+// expected-no-diagnostics
+
+typedef float float8 __attribute__((ext_vector_type(8)));
+
+void foo() {
+    float8 f2 = (float8){0, 0, 0, 0, 0, 0, 0, 0};
+    (void)f2.s01234;
+    (void)f2.xyzxy;
+}

test/SemaOpenCL/vector_swizzle_length.cl

-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 -x cl %s -verify -pedantic -fsyntax-only
 
 typedef float float8 __attribute__((ext_vector_type(8)));
 
 void foo() {
-    float8 f2 = (float8)(0, 0, 0, 0, 0, 0, 0, 0);
+    float8 f2 = (float8){0, 0, 0, 0, 0, 0, 0, 0};
 
     f2.s01234; // expected-error {{vector component access has invalid length 5.  Supported: 1,2,3,4,8,16}}
     f2.xyzxy; // expected-error {{vector component access has invalid length 5.  Supported: 1,2,3,4,8,16}}
 }