<div dir="ltr">I think d0k fixed that in 232054.<br></div><br><div class="gmail_quote">On Thu, Mar 12, 2015 at 5:39 PM Aaron Ballman <<a href="mailto:aaron@aaronballman.com">aaron@aaronballman.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, Mar 12, 2015 at 11:48 AM, Manuel Klimek <<a href="mailto:klimek@google.com" target="_blank">klimek@google.com</a>> wrote:<br>
> Author: klimek<br>
> Date: Thu Mar 12 10:48:15 2015<br>
> New Revision: 232051<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=232051&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=232051&view=rev</a><br>
> Log:<br>
> Add support for a few Objective-C matchers.<br>
><br>
> Add some matchers for Objective-C selectors and messages to<br>
> ASTMatchers.h. Minor mods to ASTMatchersTest.h to allow test files with<br>
> ".m" extension in addition to ".cpp". New tests added to<br>
> ASTMatchersTest.c.<br>
><br>
> Patch by Dean Sutherland.<br>
<br>
When I commit this previously, I had to revert due to broken bots.<br>
<br>
<a href="http://bb.pgr.jp/builders/ninja-clang-x64-mingw64-RA/builds/6352/steps/build/logs/stdio" target="_blank">http://bb.pgr.jp/builders/<u></u>ninja-clang-x64-mingw64-RA/<u></u>builds/6352/steps/build/logs/<u></u>stdio</a><br>
<br>
~Aaron<br>
<br>
><br>
> Modified:<br>
> cfe/trunk/include/clang/<u></u>ASTMatchers/ASTMatchers.h<br>
> cfe/trunk/include/clang/<u></u>ASTMatchers/<u></u>ASTMatchersInternal.h<br>
> cfe/trunk/lib/ASTMatchers/<u></u>Dynamic/Registry.cpp<br>
> cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.<u></u>cpp<br>
> cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.h<br>
><br>
> Modified: cfe/trunk/include/clang/<u></u>ASTMatchers/ASTMatchers.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h?rev=232051&r1=232050&r2=232051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/cfe/trunk/include/<u></u>clang/ASTMatchers/ASTMatchers.<u></u>h?rev=232051&r1=232050&r2=<u></u>232051&view=diff</a><br>
> ==============================<u></u>==============================<u></u>==================<br>
> --- cfe/trunk/include/clang/<u></u>ASTMatchers/ASTMatchers.h (original)<br>
> +++ cfe/trunk/include/clang/<u></u>ASTMatchers/ASTMatchers.h Thu Mar 12 10:48:15 2015<br>
> @@ -47,6 +47,7 @@<br>
><br>
> #include "clang/AST/ASTContext.h"<br>
> #include "clang/AST/DeclFriend.h"<br>
> +#include "clang/AST/DeclObjC.h"<br>
> #include "clang/AST/DeclTemplate.h"<br>
> #include "clang/ASTMatchers/<u></u>ASTMatchersInternal.h"<br>
> #include "clang/ASTMatchers/<u></u>ASTMatchersMacros.h"<br>
> @@ -869,6 +870,20 @@ const internal::<u></u>VariadicDynCastAllOfMatc<br>
> Stmt,<br>
> CXXMemberCallExpr> memberCallExpr;<br>
><br>
> +/// \brief Matches ObjectiveC Message invocation expressions.<br>
> +///<br>
> +/// The innermost message send invokes the "alloc" class method on the<br>
> +/// NSString class, while the outermost message send invokes the<br>
> +/// "initWithString" instance method on the object returned from<br>
> +/// NSString's "alloc". This matcher should match both message sends.<br>
> +/// \code<br>
> +/// [[NSString alloc] initWithString:@"Hello"]<br>
> +/// \endcode<br>
> +const internal::<u></u>VariadicDynCastAllOfMatcher<<br>
> + Stmt,<br>
> + ObjCMessageExpr> objcMessageExpr;<br>
> +<br>
> +<br>
> /// \brief Matches expressions that introduce cleanups to be run at the end<br>
> /// of the sub-expression's evaluation.<br>
> ///<br>
> @@ -2007,6 +2022,104 @@ AST_MATCHER_P(<u></u>CXXMemberCallExpr, on, int<br>
> InnerMatcher.matches(*<u></u>ExprNode, Finder, Builder));<br>
> }<br>
><br>
> +<br>
> +/// \brief Matches on the receiver of an ObjectiveC Message expression.<br>
> +///<br>
> +/// Example<br>
> +/// matcher = objCMessageExpr(<u></u>hasRecieverType(asString("<u></u>UIWebView *")));<br>
> +/// matches the [webView ...] message invocation.<br>
> +/// \code<br>
> +/// NSString *webViewJavaScript = ...<br>
> +/// UIWebView *webView = ...<br>
> +/// [webView stringByEvaluatingJavaScriptFr<u></u>omString:webViewJavascript];<br>
> +/// \endcode<br>
> +AST_MATCHER_P(<u></u>ObjCMessageExpr, hasReceiverType, internal::Matcher<QualType>,<br>
> + InnerMatcher) {<br>
> + const QualType TypeDecl = Node.getReceiverType();<br>
> + return InnerMatcher.matches(TypeDecl, Finder, Builder);<br>
> +}<br>
> +<br>
> +/// \brief Matches when BaseName == Selector.getAsString()<br>
> +///<br>
> +/// matcher = objCMessageExpr(hasSelector("<u></u>loadHTMLString:baseURL:"));<br>
> +/// matches the outer message expr in the code below, but NOT the message<br>
> +/// invocation for self.bodyView.<br>
> +/// \code<br>
> +/// [self.bodyView loadHTMLString:html baseURL:NULL];<br>
> +/// \endcode<br>
> + AST_MATCHER_P(ObjCMessageExpr, hasSelector, std::string, BaseName) {<br>
> + Selector Sel = Node.getSelector();<br>
> + return BaseName.compare(Sel.<u></u>getAsString()) == 0;<br>
> +}<br>
> +<br>
> +<br>
> +/// \brief Matches ObjC selectors whose name contains<br>
> +/// a substring matched by the given RegExp.<br>
> +/// matcher = objCMessageExpr(<u></u>matchesSelector("<u></u>loadHTMLString\:baseURL?"));<br>
> +/// matches the outer message expr in the code below, but NOT the message<br>
> +/// invocation for self.bodyView.<br>
> +/// \code<br>
> +/// [self.bodyView loadHTMLString:html baseURL:NULL];<br>
> +/// \endcode<br>
> +AST_MATCHER_P(<u></u>ObjCMessageExpr, matchesSelector, std::string, RegExp) {<br>
> + assert(!RegExp.empty());<br>
> + std::string SelectorString = Node.getSelector().<u></u>getAsString();<br>
> + llvm::Regex RE(RegExp);<br>
> + return RE.match(SelectorString);<br>
> +}<br>
> +<br>
> +/// \brief Matches when the selector is the empty selector<br>
> +///<br>
> +/// Matches only when the selector of the objCMessageExpr is NULL. This may<br>
> +/// represent an error condition in the tree!<br>
> +AST_MATCHER(ObjCMessageExpr, hasNullSelector) {<br>
> + return Node.getSelector().isNull();<br>
> +}<br>
> +<br>
> +/// \brief Matches when the selector is a Unary Selector<br>
> +///<br>
> +/// matcher = objCMessageExpr(<u></u>matchesSelector(<u></u>hasUnarySelector());<br>
> +/// matches self.bodyView in the code below, but NOT the outer message<br>
> +/// invocation of "loadHTMLString:baseURL:".<br>
> +/// \code<br>
> +/// [self.bodyView loadHTMLString:html baseURL:NULL];<br>
> +/// \endcode<br>
> +AST_MATCHER(ObjCMessageExpr, hasUnarySelector) {<br>
> + return Node.getSelector().<u></u>isUnarySelector();<br>
> +}<br>
> +<br>
> +/// \brief Matches when the selector is a keyword selector<br>
> +///<br>
> +/// objCMessageExpr(<u></u>hasKeywordSelector()) matches the generated setFrame<br>
> +/// message expression in<br>
> +///<br>
> +/// \code<br>
> +/// UIWebView *webView = ...;<br>
> +/// CGRect bodyFrame = webView.frame;<br>
> +/// bodyFrame.size.height = self.bodyContentHeight;<br>
> +/// webView.frame = bodyFrame;<br>
> +/// // ^---- matches here<br>
> +/// \endcode<br>
> +<br>
> +AST_MATCHER(ObjCMessageExpr, hasKeywordSelector) {<br>
> + return Node.getSelector().<u></u>isKeywordSelector();<br>
> +}<br>
> +<br>
> +/// \brief Matches when the selector has the specified number of arguments<br>
> +///<br>
> +/// matcher = objCMessageExpr(<u></u>numSelectorArgs(1));<br>
> +/// matches self.bodyView in the code below<br>
> +///<br>
> +/// matcher = objCMessageExpr(<u></u>numSelectorArgs(2));<br>
> +/// matches the invocation of "loadHTMLString:baseURL:" but not that<br>
> +/// of self.bodyView<br>
> +/// \code<br>
> +/// [self.bodyView loadHTMLString:html baseURL:NULL];<br>
> +/// \endcode<br>
> +AST_MATCHER_P(<u></u>ObjCMessageExpr, numSelectorArgs, unsigned, N) {<br>
> + return Node.getSelector().getNumArgs(<u></u>) == N;<br>
> +}<br>
> +<br>
> /// \brief Matches if the call expression's callee expression matches.<br>
> ///<br>
> /// Given<br>
> @@ -2316,7 +2429,8 @@ AST_MATCHER(VarDecl, hasGlobalStorage) {<br>
> /// \endcode<br>
> AST_POLYMORPHIC_MATCHER_P(<u></u>argumentCountIs,<br>
> AST_POLYMORPHIC_SUPPORTED_<u></u>TYPES(CallExpr,<br>
> - CXXConstructExpr),<br>
> + CXXConstructExpr,<br>
> + ObjCMessageExpr),<br>
> unsigned, N) {<br>
> return Node.getNumArgs() == N;<br>
> }<br>
> @@ -2331,7 +2445,8 @@ AST_POLYMORPHIC_MATCHER_P(<u></u>argumentCountI<br>
> /// \endcode<br>
> AST_POLYMORPHIC_MATCHER_P2(<u></u>hasArgument,<br>
> AST_POLYMORPHIC_SUPPORTED_<u></u>TYPES(CallExpr,<br>
> - CXXConstructExpr),<br>
> + CXXConstructExpr,<br>
> + ObjCMessageExpr),<br>
> unsigned, N, internal::Matcher<Expr>, InnerMatcher) {<br>
> return (N < Node.getNumArgs() &&<br>
> InnerMatcher.matches(<br>
><br>
> Modified: cfe/trunk/include/clang/<u></u>ASTMatchers/<u></u>ASTMatchersInternal.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h?rev=232051&r1=232050&r2=232051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/cfe/trunk/include/<u></u>clang/ASTMatchers/<u></u>ASTMatchersInternal.h?rev=<u></u>232051&r1=232050&r2=232051&<u></u>view=diff</a><br>
> ==============================<u></u>==============================<u></u>==================<br>
> --- cfe/trunk/include/clang/<u></u>ASTMatchers/<u></u>ASTMatchersInternal.h (original)<br>
> +++ cfe/trunk/include/clang/<u></u>ASTMatchers/<u></u>ASTMatchersInternal.h Thu Mar 12 10:48:15 2015<br>
> @@ -38,9 +38,12 @@<br>
> #include "clang/AST/ASTTypeTraits.h"<br>
> #include "clang/AST/Decl.h"<br>
> #include "clang/AST/DeclCXX.h"<br>
> +#include "clang/AST/DeclObjC.h"<br>
> #include "clang/AST/ExprCXX.h"<br>
> +#include "clang/AST/ExprObjC.h"<br>
> #include "clang/AST/Stmt.h"<br>
> #include "clang/AST/StmtCXX.h"<br>
> +#include "clang/AST/StmtObjC.h"<br>
> #include "clang/AST/Type.h"<br>
> #include "llvm/ADT/Optional.h"<br>
> #include "llvm/ADT/VariadicFunction.h"<br>
><br>
> Modified: cfe/trunk/lib/ASTMatchers/<u></u>Dynamic/Registry.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp?rev=232051&r1=232050&r2=232051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/cfe/trunk/lib/<u></u>ASTMatchers/Dynamic/Registry.<u></u>cpp?rev=232051&r1=232050&r2=<u></u>232051&view=diff</a><br>
> ==============================<u></u>==============================<u></u>==================<br>
> --- cfe/trunk/lib/ASTMatchers/<u></u>Dynamic/Registry.cpp (original)<br>
> +++ cfe/trunk/lib/ASTMatchers/<u></u>Dynamic/Registry.cpp Thu Mar 12 10:48:15 2015<br>
> @@ -198,6 +198,7 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(hasIncrement)<u></u>;<br>
> REGISTER_MATCHER(hasIndex);<br>
> REGISTER_MATCHER(<u></u>hasInitializer);<br>
> + REGISTER_MATCHER(<u></u>hasKeywordSelector);<br>
> REGISTER_MATCHER(hasLHS);<br>
> REGISTER_MATCHER(<u></u>hasLocalQualifiers);<br>
> REGISTER_MATCHER(<u></u>hasLocalStorage);<br>
> @@ -205,6 +206,7 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(<u></u>hasLoopVariable);<br>
> REGISTER_MATCHER(hasMethod);<br>
> REGISTER_MATCHER(hasName);<br>
> + REGISTER_MATCHER(<u></u>hasNullSelector);<br>
> REGISTER_MATCHER(<u></u>hasObjectExpression);<br>
> REGISTER_MATCHER(<u></u>hasOperatorName);<br>
> REGISTER_MATCHER(<u></u>hasOverloadedOperatorName);<br>
> @@ -212,7 +214,9 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(hasParent);<br>
> REGISTER_MATCHER(hasQualifier)<u></u>;<br>
> REGISTER_MATCHER(hasRangeInit)<u></u>;<br>
> + REGISTER_MATCHER(<u></u>hasReceiverType);<br>
> REGISTER_MATCHER(hasRHS);<br>
> + REGISTER_MATCHER(hasSelector);<br>
> REGISTER_MATCHER(<u></u>hasSingleDecl);<br>
> REGISTER_MATCHER(hasSize);<br>
> REGISTER_MATCHER(hasSizeExpr);<br>
> @@ -223,6 +227,7 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(<u></u>hasTrueExpression);<br>
> REGISTER_MATCHER(hasTypeLoc);<br>
> REGISTER_MATCHER(<u></u>hasUnaryOperand);<br>
> + REGISTER_MATCHER(<u></u>hasUnarySelector);<br>
> REGISTER_MATCHER(hasValueType)<u></u>;<br>
> REGISTER_MATCHER(ifStmt);<br>
> REGISTER_MATCHER(<u></u>ignoringImpCasts);<br>
> @@ -262,6 +267,7 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(lambdaExpr);<br>
> REGISTER_MATCHER(<u></u>lValueReferenceType);<br>
> REGISTER_MATCHER(matchesName);<br>
> + REGISTER_MATCHER(<u></u>matchesSelector);<br>
> REGISTER_MATCHER(<u></u>materializeTemporaryExpr);<br>
> REGISTER_MATCHER(member);<br>
> REGISTER_MATCHER(<u></u>memberCallExpr);<br>
> @@ -276,7 +282,9 @@ RegistryMaps::RegistryMaps() {<br>
> REGISTER_MATCHER(newExpr);<br>
> REGISTER_MATCHER(<u></u>nullPtrLiteralExpr);<br>
> REGISTER_MATCHER(nullStmt);<br>
> + REGISTER_MATCHER(<u></u>numSelectorArgs);<br>
> REGISTER_MATCHER(ofClass);<br>
> + REGISTER_MATCHER(<u></u>objcMessageExpr);<br>
> REGISTER_MATCHER(on);<br>
> REGISTER_MATCHER(<u></u>onImplicitObjectArgument);<br>
> REGISTER_MATCHER(<u></u>operatorCallExpr);<br>
><br>
> Modified: cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.<u></u>cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp?rev=232051&r1=232050&r2=232051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.<u></u>cpp?rev=232051&r1=232050&r2=<u></u>232051&view=diff</a><br>
> ==============================<u></u>==============================<u></u>==================<br>
> --- cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.<u></u>cpp (original)<br>
> +++ cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.<u></u>cpp Thu Mar 12 10:48:15 2015<br>
> @@ -4714,5 +4714,50 @@ TEST(Matcher, IsExpansionInFileMatching)<br>
><br>
> #endif // LLVM_ON_WIN32<br>
><br>
> +<br>
> +TEST(ObjCMessageExprMatcher, SimpleExprs) {<br>
> + // don't find ObjCMessageExpr where none are present<br>
> + EXPECT_TRUE(notMatchesObjC("", objcMessageExpr(anything())));<br>
> +<br>
> + std::string Objc1String =<br>
> + "@interface Str "<br>
> + " - (Str *)uppercaseString:(Str *)str;"<br>
> + "@end "<br>
> + "@interface foo "<br>
> + "- (void)meth:(Str *)text;"<br>
> + "@end "<br>
> + " "<br>
> + "@implementation foo "<br>
> + "- (void) meth:(Str *)text { "<br>
> + " [self contents];"<br>
> + " Str *up = [text uppercaseString];"<br>
> + "} "<br>
> + "@end ";<br>
> + EXPECT_TRUE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(anything())));<br>
> + EXPECT_TRUE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(hasSelector("<u></u>contents"))));<br>
> + EXPECT_TRUE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(<u></u>matchesSelector("cont*"))));<br>
> + EXPECT_FALSE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(<u></u>matchesSelector("?cont*"))));<br>
> + EXPECT_TRUE(notMatchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(hasSelector("<u></u>contents"), hasNullSelector())));<br>
> + EXPECT_TRUE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(hasSelector("<u></u>contents"), hasUnarySelector())));<br>
> + EXPECT_TRUE(matchesObjC(<br>
> + Objc1String,<br>
> + objcMessageExpr(<u></u>matchesSelector("uppercase*"),<br>
> + argumentCountIs(0)<br>
> + )));<br>
> +<br>
> +}<br>
> +<br>
> } // end namespace ast_matchers<br>
> } // end namespace clang<br>
><br>
> Modified: cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.h?rev=232051&r1=232050&r2=232051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.h?<u></u>rev=232051&r1=232050&r2=<u></u>232051&view=diff</a><br>
> ==============================<u></u>==============================<u></u>==================<br>
> --- cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.h (original)<br>
> +++ cfe/trunk/unittests/<u></u>ASTMatchers/ASTMatchersTest.h Thu Mar 12 10:48:15 2015<br>
> @@ -62,7 +62,8 @@ template <typename T><br>
> testing::AssertionResult matchesConditionally(<br>
> const std::string &Code, const T &AMatcher, bool ExpectMatch,<br>
> llvm::StringRef CompileArg,<br>
> - const FileContentMappings &VirtualMappedFiles = FileContentMappings()) {<br>
> + const FileContentMappings &VirtualMappedFiles = FileContentMappings(),<br>
> + const std::string &Filename = "input.cc") {<br>
> bool Found = false, DynamicFound = false;<br>
> MatchFinder Finder;<br>
> VerifyMatch VerifyFound(nullptr, &Found);<br>
> @@ -78,7 +79,7 @@ testing::AssertionResult matchesConditio<br>
> // Some tests need rtti/exceptions on<br>
> Args.push_back("-frtti");<br>
> Args.push_back("-fexceptions")<u></u>;<br>
> - if (!runToolOnCodeWithArgs(<u></u>Factory->create(), Code, Args, "input.cc",<br>
> + if (!runToolOnCodeWithArgs(<u></u>Factory->create(), Code, Args, Filename,<br>
> VirtualMappedFiles)) {<br>
> return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";<br>
> }<br>
> @@ -109,6 +110,23 @@ testing::AssertionResult notMatches(cons<br>
> return matchesConditionally(Code, AMatcher, false, "-std=c++11");<br>
> }<br>
><br>
> +template <typename T><br>
> +testing::AssertionResult matchesObjC(const std::string &Code,<br>
> + const T &AMatcher) {<br>
> + return matchesConditionally(<br>
> + Code, AMatcher, true,<br>
> + "", FileContentMappings(), "input.m");<br>
> +}<br>
> +<br>
> +template <typename T><br>
> +testing::AssertionResult notMatchesObjC(const std::string &Code,<br>
> + const T &AMatcher) {<br>
> + return matchesConditionally(<br>
> + Code, AMatcher, false,<br>
> + "", FileContentMappings(), "input.m");<br>
> +}<br>
> +<br>
> +<br>
> // Function based on matchesConditionally with "-x cuda" argument added and<br>
> // small CUDA header prepended to the code string.<br>
> template <typename T><br>
><br>
><br>
> ______________________________<u></u>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/cfe-commits</a><br>
</blockquote></div>