Revert rCTE352968 due to compilation failures 💥

llvm-svn: 352969

2 files changed, 3 insertions, 15 deletions

diff --git a/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp b/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
index 8096d65d7f1..3eeb6fa620d 100644
--- a/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
@@ -93,16 +93,12 @@ void FunctionNamingCheck::registerMatchers(MatchFinder *Finder) {
   if (!getLangOpts().ObjC)
     return;
 
-  // Enforce Objective-C function naming conventions on all functions except:
-  // • Functions defined in system headers.
-  // • C++ member functions.
-  // • Namespaced functions.
-  // • Implicitly defined functions.
-  // • The main function.
+  // Match function declarations that are not in system headers and are not
+  // main.
   Finder->addMatcher(
       functionDecl(
           unless(anyOf(isExpansionInSystemHeader(), cxxMethodDecl(),
-                       hasAncestor(namespaceDecl()), isMain(), isImplicit(),
+                       hasAncestor(namespaceDecl()), isMain(),
                        matchesName(validFunctionNameRegex(true)),
                        allOf(isStaticStorageClass(),
                              matchesName(validFunctionNameRegex(false))))))
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m b/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m
index 82169cf9ce6..d0336d267cf 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m
+++ b/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m
@@ -1,13 +1,5 @@
 // RUN: %check_clang_tidy %s google-objc-function-naming %t
 
-#import <stdio.h>
-
-static void TestImplicitFunctionDeclaration(int a) {
-  // Call a builtin function so that the compiler generates an implicit
-  // function declaration.
-  printf("%d", a);
-}
-
 typedef _Bool bool;
 
 static bool ispositive(int a) { return a > 0; }