danix800 updated this revision to Diff 547615. danix800 added a comment. Apply git-clang-format
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D157238/new/ https://reviews.llvm.org/D157238 Files: clang/docs/LibASTMatchersReference.html clang/docs/ReleaseNotes.rst clang/include/clang/ASTMatchers/ASTMatchers.h clang/lib/AST/ASTImporter.cpp clang/lib/ASTMatchers/ASTMatchersInternal.cpp clang/lib/ASTMatchers/Dynamic/Registry.cpp clang/unittests/AST/ASTImporterFixtures.h clang/unittests/AST/ASTImporterTest.cpp clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
Index: clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp =================================================================== --- clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp @@ -1560,6 +1560,20 @@ dependentSizedArrayType())); } +TEST_P(ASTMatchersTest, DependentSizedExtVectorType) { + if (!GetParam().isCXX()) { + return; + } + EXPECT_TRUE(matches("template<typename T, int Size>" + "class vector {" + " typedef T __attribute__((ext_vector_type(Size))) type;" + "};", + dependentSizedExtVectorType())); + EXPECT_TRUE( + notMatches("int a[42]; int b[] = { 2, 3 }; void f() { int c[b[0]]; }", + dependentSizedExtVectorType())); +} + TEST_P(ASTMatchersTest, IncompleteArrayType) { EXPECT_TRUE(matches("int a[] = { 2, 3 };", incompleteArrayType())); EXPECT_TRUE(matches("void f(int a[]) {}", incompleteArrayType())); Index: clang/unittests/AST/ASTImporterTest.cpp =================================================================== --- clang/unittests/AST/ASTImporterTest.cpp +++ clang/unittests/AST/ASTImporterTest.cpp @@ -1044,6 +1044,17 @@ has(fieldDecl(hasType(dependentSizedArrayType()))))))); } +TEST_P(ImportExpr, DependentSizedExtVectorType) { + MatchVerifier<Decl> Verifier; + testImport("template<typename T, int Size>" + "class declToImport {" + " typedef T __attribute__((ext_vector_type(Size))) type;" + "};", + Lang_CXX03, "", Lang_CXX03, Verifier, + classTemplateDecl(has(cxxRecordDecl( + has(typedefDecl(hasType(dependentSizedExtVectorType()))))))); +} + TEST_P(ASTImporterOptionSpecificTestBase, ImportUsingPackDecl) { Decl *FromTU = getTuDecl( "struct A { int operator()() { return 1; } };" Index: clang/unittests/AST/ASTImporterFixtures.h =================================================================== --- clang/unittests/AST/ASTImporterFixtures.h +++ clang/unittests/AST/ASTImporterFixtures.h @@ -260,6 +260,8 @@ FromAST->getFileManager(), false); auto FoundNodes = match(SearchMatcher, FromCtx); + if (FoundNodes.empty()) + return testing::AssertionFailure() << "No node was found!"; if (FoundNodes.size() != 1) return testing::AssertionFailure() << "Multiple potential nodes were found!"; Index: clang/lib/ASTMatchers/Dynamic/Registry.cpp =================================================================== --- clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -227,6 +227,7 @@ REGISTER_MATCHER(defaultStmt); REGISTER_MATCHER(dependentCoawaitExpr); REGISTER_MATCHER(dependentSizedArrayType); + REGISTER_MATCHER(dependentSizedExtVectorType); REGISTER_MATCHER(designatedInitExpr); REGISTER_MATCHER(designatorCountIs); REGISTER_MATCHER(doStmt); Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp =================================================================== --- clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -1046,6 +1046,7 @@ const AstTypeMatcher<DeducedTemplateSpecializationType> deducedTemplateSpecializationType; const AstTypeMatcher<DependentSizedArrayType> dependentSizedArrayType; +const AstTypeMatcher<DependentSizedExtVectorType> dependentSizedExtVectorType; const AstTypeMatcher<IncompleteArrayType> incompleteArrayType; const AstTypeMatcher<VariableArrayType> variableArrayType; const AstTypeMatcher<AtomicType> atomicType; Index: clang/lib/AST/ASTImporter.cpp =================================================================== --- clang/lib/AST/ASTImporter.cpp +++ clang/lib/AST/ASTImporter.cpp @@ -381,7 +381,8 @@ ExpectedType VisitIncompleteArrayType(const IncompleteArrayType *T); ExpectedType VisitVariableArrayType(const VariableArrayType *T); ExpectedType VisitDependentSizedArrayType(const DependentSizedArrayType *T); - // FIXME: DependentSizedExtVectorType + ExpectedType + VisitDependentSizedExtVectorType(const DependentSizedExtVectorType *T); ExpectedType VisitVectorType(const VectorType *T); ExpectedType VisitExtVectorType(const ExtVectorType *T); ExpectedType VisitFunctionNoProtoType(const FunctionNoProtoType *T); @@ -1264,6 +1265,18 @@ T->getIndexTypeCVRQualifiers(), ToBracketsRange); } +ExpectedType ASTNodeImporter::VisitDependentSizedExtVectorType( + const DependentSizedExtVectorType *T) { + Error Err = Error::success(); + QualType ToElementType = importChecked(Err, T->getElementType()); + Expr *ToSizeExpr = importChecked(Err, T->getSizeExpr()); + SourceLocation ToAttrLoc = importChecked(Err, T->getAttributeLoc()); + if (Err) + return std::move(Err); + return Importer.getToContext().getDependentSizedExtVectorType( + ToElementType, ToSizeExpr, ToAttrLoc); +} + ExpectedType ASTNodeImporter::VisitVectorType(const VectorType *T) { ExpectedType ToElementTypeOrErr = import(T->getElementType()); if (!ToElementTypeOrErr) Index: clang/include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- clang/include/clang/ASTMatchers/ASTMatchers.h +++ clang/include/clang/ASTMatchers/ASTMatchers.h @@ -6938,6 +6938,21 @@ /// matches "T data[Size]" extern const AstTypeMatcher<DependentSizedArrayType> dependentSizedArrayType; +/// Matches C++ extended vector type where either the type or size is +/// dependent. +/// +/// Given +/// \code +/// template<typename T, int Size> +/// class vector { +/// typedef T __attribute__((ext_vector_type(Size))) type; +/// }; +/// \endcode +/// dependentSizedExtVectorType +/// matches "T __attribute__((ext_vector_type(Size)))" +extern const AstTypeMatcher<DependentSizedExtVectorType> + dependentSizedExtVectorType; + /// Matches C arrays with unspecified size. /// /// Given Index: clang/docs/ReleaseNotes.rst =================================================================== --- clang/docs/ReleaseNotes.rst +++ clang/docs/ReleaseNotes.rst @@ -228,6 +228,7 @@ AST Matchers ------------ +- Add ``dependentSizedExtVectorType``. clang-format ------------ Index: clang/docs/LibASTMatchersReference.html =================================================================== --- clang/docs/LibASTMatchersReference.html +++ clang/docs/LibASTMatchersReference.html @@ -2531,6 +2531,19 @@ </pre></td></tr> +<tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>></td><td class="name" onclick="toggle('dependentSizedExtVectorType')"><a name="dependentSizedExtVectorType0Anchor">dependentSizedExtVectorType</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1DependentSizedExtVectorType.html">DependentSizedExtVectorType</a>>...</td></tr> +<tr><td colspan="4" class="doc" id="dependentSizedExtVectorType0"><pre>Matches C++ extended vector type where either the type or size is dependent. + +Given + template<typename T, int Size> + class vector { + typedef T __attribute__((ext_vector_type(Size))) type; + }; +dependentSizedExtVectorType + matches "T __attribute__((ext_vector_type(Size)))" +</pre></td></tr> + + <tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>></td><td class="name" onclick="toggle('elaboratedType0')"><a name="elaboratedType0Anchor">elaboratedType</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1ElaboratedType.html">ElaboratedType</a>>...</td></tr> <tr><td colspan="4" class="doc" id="elaboratedType0"><pre>Matches types specified with an elaborated type keyword or with a qualified name.
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits