Commit 9738c757 authored by Malcolm Parsons's avatar Malcolm Parsons
Browse files

[clang-tidy] Match InitListExpr in modernize-use-default-member-init 

Summary:
modernize-use-default-member-init wasn't warning about redundant initialisers
when the initialiser was an InitListExpr.  Add initListExpr to the matcher.

Fixes: PR44439

Reviewers: aaron.ballman, alexfh, JonasToth

Reviewed By: aaron.ballman

Subscribers: xazax.hun, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D72691
parent b10f6b71

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

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void UseDefaultMemberInitCheck::registerMatchers(MatchFinder *Finder) { 
            unaryOperator(anyOf(hasOperatorName("+"), hasOperatorName("-")),

                          hasUnaryOperand(floatLiteral())),

            cxxBoolLiteral(), cxxNullPtrLiteralExpr(), implicitValueInitExpr(),

            declRefExpr(to(enumConstantDecl())));

            initListExpr(), declRefExpr(to(enumConstantDecl())));



  Finder->addMatcher(

      cxxConstructorDecl(

clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp

+32 −32
Original line number Diff line number Diff line
@@ -247,24 +247,24 @@ struct NegativeDefaultArg 
};



struct ExistingChar {

  ExistingChar(short) : e1(), e2(), e3(), e4() {}

  ExistingChar(short) : e1(), e2{}, e3(), e4() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: member initializer for 'e1' is redundant [modernize-use-default-member-init]

  // CHECK-MESSAGES: :[[@LINE-2]]:31: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:37: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingChar(short) :  e4() {}

  ExistingChar(int) : e1(0), e2(0), e3(0), e4(0) {}

  ExistingChar(int) : e1(0), e2{0}, e3(0), e4(0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:23: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:30: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:37: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingChar(int) :  e4(0) {}

  ExistingChar(long) : e1('\0'), e2('\0'), e3('\0'), e4('\0') {}

  ExistingChar(long) : e1('\0'), e2{'\0'}, e3('\0'), e4('\0') {}

  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:34: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:44: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingChar(long) :  e4('\0') {}

  ExistingChar(char) : e1('a'), e2('a'), e3('a'), e4('a') {}

  ExistingChar(char) : e1('a'), e2{'a'}, e3('a'), e4('a') {}

  // CHECK-MESSAGES: :[[@LINE-1]]:51: warning: member initializer for 'e4' is redundant

  // CHECK-FIXES: ExistingChar(char) : e1('a'), e2('a'), e3('a') {}

  // CHECK-FIXES: ExistingChar(char) : e1('a'), e2{'a'}, e3('a') {}

  char e1{};

  char e2 = 0;

  char e3 = '\0';
@@ -272,22 +272,22 @@ struct ExistingChar { 
};



struct ExistingInt {

  ExistingInt(short) : e1(), e2(), e3(), e4(), e5(), e6() {}

  ExistingInt(short) : e1(), e2{}, e3(), e4(), e5(), e6() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: member initializer for 'e1' is redundant [modernize-use-default-member-init]

  // CHECK-MESSAGES: :[[@LINE-2]]:30: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingInt(short) :  e3(), e4(), e5(), e6() {}

  ExistingInt(int) : e1(0), e2(0), e3(0), e4(0), e5(0), e6(0) {}

  ExistingInt(int) : e1(0), e2{0}, e3(0), e4(0), e5(0), e6(0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:22: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:29: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingInt(int) :  e3(0), e4(0), e5(0), e6(0) {}

  ExistingInt(long) : e1(5), e2(5), e3(5), e4(5), e5(5), e6(5) {}

  ExistingInt(long) : e1(5), e2{5}, e3(5), e4(5), e5(5), e6(5) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:37: warning: member initializer for 'e3' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:44: warning: member initializer for 'e4' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:58: warning: member initializer for 'e6' is redundant

  // CHECK-FIXES: ExistingInt(long) : e1(5), e2(5),  e5(5) {}

  ExistingInt(char) : e1(-5), e2(-5), e3(-5), e4(-5), e5(-5), e6(-5) {}

  // CHECK-FIXES: ExistingInt(long) : e1(5), e2{5},  e5(5) {}

  ExistingInt(char) : e1(-5), e2{-5}, e3(-5), e4(-5), e5(-5), e6(-5) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:55: warning: member initializer for 'e5' is redundant

  // CHECK-FIXES: ExistingInt(char) : e1(-5), e2(-5), e3(-5), e4(-5),  e6(-5) {}

  // CHECK-FIXES: ExistingInt(char) : e1(-5), e2{-5}, e3(-5), e4(-5),  e6(-5) {}

  int e1{};

  int e2 = 0;

  int e3 = {5};
@@ -297,21 +297,21 @@ struct ExistingInt { 
};



struct ExistingDouble {

  ExistingDouble(short) : e1(), e2(), e3(), e4(), e5() {}

  ExistingDouble(short) : e1(), e2{}, e3(), e4(), e5() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:27: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:33: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingDouble(short) :  e3(), e4(), e5() {}

  ExistingDouble(int) : e1(0.0), e2(0.0), e3(0.0), e4(0.0), e5(0.0) {}

  ExistingDouble(int) : e1(0.0), e2{0.0}, e3(0.0), e4(0.0), e5(0.0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:34: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingDouble(int) :  e3(0.0), e4(0.0), e5(0.0) {}

  ExistingDouble(long) : e1(5.0), e2(5.0), e3(5.0), e4(5.0), e5(5.0) {}

  ExistingDouble(long) : e1(5.0), e2{5.0}, e3(5.0), e4(5.0), e5(5.0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:44: warning: member initializer for 'e3' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:62: warning: member initializer for 'e5' is redundant

  // CHECK-FIXES: ExistingDouble(long) : e1(5.0), e2(5.0),  e4(5.0) {}

  ExistingDouble(char) : e1(-5.0), e2(-5.0), e3(-5.0), e4(-5.0), e5(-5.0) {}

  // CHECK-FIXES: ExistingDouble(long) : e1(5.0), e2{5.0},  e4(5.0) {}

  ExistingDouble(char) : e1(-5.0), e2{-5.0}, e3(-5.0), e4(-5.0), e5(-5.0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:56: warning: member initializer for 'e4' is redundant

  // CHECK-FIXES: ExistingDouble(char) : e1(-5.0), e2(-5.0), e3(-5.0),  e5(-5.0) {}

  // CHECK-FIXES: ExistingDouble(char) : e1(-5.0), e2{-5.0}, e3(-5.0),  e5(-5.0) {}

  double e1{};

  double e2 = 0.0;

  double e3 = 5.0;
@@ -320,27 +320,27 @@ struct ExistingDouble { 
};



struct ExistingBool {

  ExistingBool(short) : e1(), e2(), e3() {}

  ExistingBool(short) : e1(), e2{}, e3() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:31: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingBool(short) :  e3() {}

  ExistingBool(int) : e1(false), e2(false), e3(false) {}

  ExistingBool(int) : e1(false), e2{false}, e3(false) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:23: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:34: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingBool(int) :  e3(false) {}

  ExistingBool(long) : e1(true), e2(true), e3(true) {}

  ExistingBool(long) : e1(true), e2{true}, e3(true) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:44: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingBool(long) : e1(true), e2(true) {}

  // CHECK-FIXES: ExistingBool(long) : e1(true), e2{true} {}

  bool e1{};

  bool e2 = false;

  bool e3{true};

};



struct ExistingEnum {

  ExistingEnum(short) : e1(Foo), e2(Foo) {}

  ExistingEnum(short) : e1(Foo), e2{Foo} {}

  // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: member initializer for 'e1' is redundant

  // CHECK-FIXES: ExistingEnum(short) :  e2(Foo) {}

  ExistingEnum(int) : e1(Bar), e2(Bar) {}

  // CHECK-FIXES: ExistingEnum(short) :  e2{Foo} {}

  ExistingEnum(int) : e1(Bar), e2{Bar} {}

  // CHECK-MESSAGES: :[[@LINE-1]]:32: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingEnum(int) : e1(Bar) {}

  Enum e1 = Foo;
@@ -348,17 +348,17 @@ struct ExistingEnum { 
};



struct ExistingPointer {

  ExistingPointer(short) : e1(), e2(), e3(), e4() {}

  ExistingPointer(short) : e1(), e2{}, e3(), e4() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:28: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:34: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:40: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingPointer(short) :  e4() {}

  ExistingPointer(int) : e1(0), e2(0), e3(0), e4(&e1) {}

  ExistingPointer(int) : e1(0), e2{0}, e3(0), e4(&e1) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:26: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:33: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:40: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingPointer(int) :  e4(&e1) {}

  ExistingPointer(long) : e1(nullptr), e2(nullptr), e3(nullptr), e4(&e2) {}

  ExistingPointer(long) : e1(nullptr), e2{nullptr}, e3(nullptr), e4(&e2) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:27: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:40: warning: member initializer for 'e2' is redundant

  // CHECK-MESSAGES: :[[@LINE-3]]:53: warning: member initializer for 'e3' is redundant
@@ -370,21 +370,21 @@ struct ExistingPointer { 
};



struct ExistingString {

  ExistingString(short) : e1(), e2(), e3(), e4() {}

  ExistingString(short) : e1(), e2{}, e3(), e4() {}

  // CHECK-MESSAGES: :[[@LINE-1]]:27: warning: member initializer for 'e1' is redundant [modernize-use-default-member-init]

  // CHECK-MESSAGES: :[[@LINE-2]]:33: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingString(short) :  e3(), e4() {}

  ExistingString(int) : e1(0), e2(0), e3(0), e4(0) {}

  ExistingString(int) : e1(0), e2{0}, e3(0), e4(0) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:32: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingString(int) :  e3(0), e4(0) {}

  ExistingString(long) : e1(nullptr), e2(nullptr), e3(nullptr), e4(nullptr) {}

  ExistingString(long) : e1(nullptr), e2{nullptr}, e3(nullptr), e4(nullptr) {}

  // CHECK-MESSAGES: :[[@LINE-1]]:26: warning: member initializer for 'e1' is redundant

  // CHECK-MESSAGES: :[[@LINE-2]]:39: warning: member initializer for 'e2' is redundant

  // CHECK-FIXES: ExistingString(long) :  e3(nullptr), e4(nullptr) {}

  ExistingString(char) : e1("foo"), e2("foo"), e3("foo"), e4("foo") {}

  ExistingString(char) : e1("foo"), e2{"foo"}, e3("foo"), e4("foo") {}

  // CHECK-MESSAGES: :[[@LINE-1]]:48: warning: member initializer for 'e3' is redundant

  // CHECK-FIXES: ExistingString(char) : e1("foo"), e2("foo"),  e4("foo") {}

  // CHECK-FIXES: ExistingString(char) : e1("foo"), e2{"foo"},  e4("foo") {}

  const char *e1{};

  const char *e2 = nullptr;

  const char *e3 = "foo";