diff options
| -rw-r--r-- | clang/bindings/python/clang/cindex.py | 2 | ||||
| -rw-r--r-- | clang/include/clang-c/Index.h | 6 | ||||
| -rw-r--r-- | clang/test/Index/opencl-types.cl | 6 | ||||
| -rw-r--r-- | clang/tools/libclang/CXType.cpp | 8 |
4 files changed, 17 insertions, 5 deletions
diff --git a/clang/bindings/python/clang/cindex.py b/clang/bindings/python/clang/cindex.py index 113697eb4f1..8e5a9fe0068 100644 --- a/clang/bindings/python/clang/cindex.py +++ b/clang/bindings/python/clang/cindex.py @@ -2121,6 +2121,8 @@ TypeKind.OCLEVENT = TypeKind(158) TypeKind.OCLQUEUE = TypeKind(159) TypeKind.OCLRESERVEID = TypeKind(160) +TypeKind.EXTVECTOR = TypeKind(176) + class RefQualifierKind(BaseEnumeration): """Describes a specific ref-qualifier of a type.""" diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h index 7654656664f..4f2f521f92f 100644 --- a/clang/include/clang-c/Index.h +++ b/clang/include/clang-c/Index.h @@ -32,7 +32,7 @@ * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable. */ #define CINDEX_VERSION_MAJOR 0 -#define CINDEX_VERSION_MINOR 54 +#define CINDEX_VERSION_MINOR 55 #define CINDEX_VERSION_ENCODE(major, minor) ( \ ((major) * 10000) \ @@ -3315,7 +3315,9 @@ enum CXTypeKind { CXType_OCLIntelSubgroupAVCImeResultDualRefStreamout = 173, CXType_OCLIntelSubgroupAVCImeSingleRefStreamin = 174, - CXType_OCLIntelSubgroupAVCImeDualRefStreamin = 175 + CXType_OCLIntelSubgroupAVCImeDualRefStreamin = 175, + + CXType_ExtVector = 176 }; /** diff --git a/clang/test/Index/opencl-types.cl b/clang/test/Index/opencl-types.cl index 9eb680843ac..e132c9d05ac 100644 --- a/clang/test/Index/opencl-types.cl +++ b/clang/test/Index/opencl-types.cl @@ -17,11 +17,11 @@ void kernel testFloatTypes() { } // CHECK: VarDecl=scalarHalf:11:8 (Definition){{( \(invalid\))?}} [type=half] [typekind=Half] [isPOD=1] -// CHECK: VarDecl=vectorHalf:12:9 (Definition) [type=half4] [typekind=Typedef] [canonicaltype=half __attribute__((ext_vector_type(4)))] [canonicaltypekind=Unexposed] [isPOD=1] +// CHECK: VarDecl=vectorHalf:12:9 (Definition) [type=half4] [typekind=Typedef] [canonicaltype=half __attribute__((ext_vector_type(4)))] [canonicaltypekind=ExtVector] [isPOD=1] // CHECK: VarDecl=scalarFloat:13:9 (Definition) [type=float] [typekind=Float] [isPOD=1] -// CHECK: VarDecl=vectorFloat:14:10 (Definition) [type=float4] [typekind=Typedef] [canonicaltype=float __attribute__((ext_vector_type(4)))] [canonicaltypekind=Unexposed] [isPOD=1] +// CHECK: VarDecl=vectorFloat:14:10 (Definition) [type=float4] [typekind=Typedef] [canonicaltype=float __attribute__((ext_vector_type(4)))] [canonicaltypekind=ExtVector] [isPOD=1] // CHECK: VarDecl=scalarDouble:15:10 (Definition){{( \(invalid\))?}} [type=double] [typekind=Double] [isPOD=1] -// CHECK: VarDecl=vectorDouble:16:11 (Definition){{( \(invalid\))?}} [type=double4] [typekind=Typedef] [canonicaltype=double __attribute__((ext_vector_type(4)))] [canonicaltypekind=Unexposed] [isPOD=1] +// CHECK: VarDecl=vectorDouble:16:11 (Definition){{( \(invalid\))?}} [type=double4] [typekind=Typedef] [canonicaltype=double __attribute__((ext_vector_type(4)))] [canonicaltypekind=ExtVector] [isPOD=1] #pragma OPENCL EXTENSION cl_khr_gl_msaa_sharing : enable diff --git a/clang/tools/libclang/CXType.cpp b/clang/tools/libclang/CXType.cpp index eb2d17f0c3f..4d22a5e00b9 100644 --- a/clang/tools/libclang/CXType.cpp +++ b/clang/tools/libclang/CXType.cpp @@ -109,6 +109,7 @@ static CXTypeKind GetTypeKind(QualType T) { TKCASE(VariableArray); TKCASE(DependentSizedArray); TKCASE(Vector); + TKCASE(ExtVector); TKCASE(MemberPointer); TKCASE(Auto); TKCASE(Elaborated); @@ -600,6 +601,7 @@ CXString clang_getTypeKindSpelling(enum CXTypeKind K) { TKIND(VariableArray); TKIND(DependentSizedArray); TKIND(Vector); + TKIND(ExtVector); TKIND(MemberPointer); TKIND(Auto); TKIND(Elaborated); @@ -804,6 +806,9 @@ CXType clang_getElementType(CXType CT) { case Type::Vector: ET = cast<VectorType> (TP)->getElementType(); break; + case Type::ExtVector: + ET = cast<ExtVectorType>(TP)->getElementType(); + break; case Type::Complex: ET = cast<ComplexType> (TP)->getElementType(); break; @@ -827,6 +832,9 @@ long long clang_getNumElements(CXType CT) { case Type::Vector: result = cast<VectorType> (TP)->getNumElements(); break; + case Type::ExtVector: + result = cast<ExtVectorType>(TP)->getNumElements(); + break; default: break; } |
