Commit 7399f70f authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r353327: 

------------------------------------------------------------------------
r353327 | lebedevri | 2019-02-06 20:17:30 +0100 (Wed, 06 Feb 2019) | 18 lines

[clang-tidy] modernize-avoid-c-arrays: avoid main function (PR40604)

Summary:
The check should ignore the main function, the program entry point.
It is not possible to use `std::array<>` for the `argv`.
The alternative is to use `char** argv`.

Fixes [[ https://bugs.llvm.org/show_bug.cgi?id=40604 | PR40604 ]]

Reviewers: JonasToth, aaron.ballman

Reviewed By: aaron.ballman

Subscribers: xazax.hun, hans, cfe-commits

Tags: #clang-tools-extra, #clang

Differential Revision: https://reviews.llvm.org/D57787
------------------------------------------------------------------------

llvm-svn: 353391
parent 33fc712a

clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp

+8 −1
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ AST_MATCHER(clang::RecordDecl, isExternCContext) { 
  return Node.isExternCContext();

}



AST_MATCHER(clang::ParmVarDecl, isArgvOfMain) {

  const clang::DeclContext *DC = Node.getDeclContext();

  const auto *FD = llvm::dyn_cast<clang::FunctionDecl>(DC);

  return FD ? FD->isMain() : false;

}



} // namespace



namespace clang {
@@ -44,7 +50,8 @@ void AvoidCArraysCheck::registerMatchers(MatchFinder *Finder) { 


  Finder->addMatcher(

      typeLoc(hasValidBeginLoc(), hasType(arrayType()),

              unless(anyOf(hasParent(varDecl(isExternC())),

              unless(anyOf(hasParent(parmVarDecl(isArgvOfMain())),

                           hasParent(varDecl(isExternC())),

                           hasParent(fieldDecl(

                               hasParent(recordDecl(isExternCContext())))),

                           hasAncestor(functionDecl(isExternC())))))

clang-tools-extra/docs/clang-tidy/checks/modernize-avoid-c-arrays.rst

+4 −0
Original line number Diff line number Diff line
@@ -54,3 +54,7 @@ such headers between C code, and C++ code. 
  }



  }



Similarly, the ``main()`` function is ignored. Its second and third parameters

can be either ``char* argv[]`` or ``char** argv``, but can not be

``std::array<>``.

clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-main.cpp

0 → 100644
+18 −0
Original line number Diff line number Diff line 
// RUN: %check_clang_tidy %s modernize-avoid-c-arrays %t



int not_main(int argc, char *argv[]) {

  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: do not declare C-style arrays, use std::array<> instead

  int f4[] = {1, 2};

  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not declare C-style arrays, use std::array<> instead

}



int main(int argc, char *argv[]) {

  int f5[] = {1, 2};

  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not declare C-style arrays, use std::array<> instead



  auto not_main = [](int argc, char *argv[]) {

    // CHECK-MESSAGES: :[[@LINE-1]]:32: warning: do not declare C-style arrays, use std::array<> instead

    int f6[] = {1, 2};

    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not declare C-style arrays, use std::array<> instead

  };

}

clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-three-arg-main.cpp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// RUN: %check_clang_tidy %s modernize-avoid-c-arrays %t



int not_main(int argc, char *argv[], char *argw[]) {

  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: do not declare C-style arrays, use std::array<> instead

  // CHECK-MESSAGES: :[[@LINE-2]]:38: warning: do not declare C-style arrays, use std::array<> instead

  int f4[] = {1, 2};

  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not declare C-style arrays, use std::array<> instead

}



int main(int argc, char *argv[], char *argw[]) {

  int f5[] = {1, 2};

  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not declare C-style arrays, use std::array<> instead



  auto not_main = [](int argc, char *argv[], char *argw[]) {

    // CHECK-MESSAGES: :[[@LINE-1]]:32: warning: do not declare C-style arrays, use std::array<> instead

    // CHECK-MESSAGES: :[[@LINE-2]]:46: warning: do not declare C-style arrays, use std::array<> instead

    int f6[] = {1, 2};

    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not declare C-style arrays, use std::array<> instead

  };

}