[OpenCL] Constructor address space test adjusted for C++ for OpenCL 2021

[Topotuna]

Summary

Reuses C++ for OpenCL constructor address space test so that it
supports optional generic address spaces in version 2021.

[Anastasia]

LGTM! Thanks

[Anastasia]

Ping, @Topotuna do you still plan to commit this?

[Topotuna]

In D110184#3115361, @Anastasia wrote:

Ping, @Topotuna do you still plan to commit this?

Ah, yes. I will commit it in the next couple of days as well as D110155

clang/test/CodeGenOpenCLCXX/addrspace-constructors.clcpp

-// RUN: %clang_cc1 %s -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
+// RUN: %clang_cc1 %s -cl-std=clc++1.0 -DGENERIC -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
+// RUN: %clang_cc1 %s -cl-std=clc++2021 -DGENERIC -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
+// RUN: %clang_cc1 %s -cl-std=clc++2021 -cl-ext=-__opencl_c_generic_address_space,-__opencl_c_pipes -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
 
 // CHECK: %struct.X = type { i32 }
 
 // CHECK: @ci ={{.*}} addrspace(2) constant i32 0
 // CHECK: @gi ={{.*}} addrspace(1) global i32 0
 __constant int ci = 0;
 __global int gi = 0;
 
 struct X {
   int x;
 
   // Local variables are handled in local_addrspace_init.clcpp
-  X() /*__generic*/ : x(0) {}
+  X() /*__generic or __private*/ : x(0) {}
+#if defined(GENERIC)
   X() __private : x(0) {}
+#endif
   X() __global : x(0) {}
   constexpr X() __constant : x(0) {}
   constexpr X(int x) __constant : x(x) {}
 };
 
 // CHECK: @cx1 ={{.*}} addrspace(2) constant %struct.X zeroinitializer
 // CHECK: @cx2 ={{.*}} addrspace(2) constant %struct.X { i32 1 }
 // CHECK: @gx ={{.*}} addrspace(1) global %struct.X zeroinitializer