Skip to content

[clang-tidy] Raise minimum standard level for several checks from C++98 to C++11 #152401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 4, 2025
Merged

[clang-tidy] Raise minimum standard level for several checks from C++98 to C++11 #152401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f09e05a
[clang-tidy] Raise minimum standard level for several checks from C++…
localspook Aug 6, 2025
5aecaaa
Disable some more tests
localspook Aug 6, 2025
f813007
Disable another test...
localspook Aug 7, 2025
8ca6d58
Reenable tests
localspook Aug 8, 2025
f8d9953
Do it properly this time
localspook Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ReplaceAutoPtrCheck : public ClangTidyCheck {
public:
ReplaceAutoPtrCheck(StringRef Name, ClangTidyContext *Context);
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
return LangOpts.CPlusPlus;
return LangOpts.CPlusPlus11;
}
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/modernize/UseAutoCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class UseAutoCheck : public ClangTidyCheck {
public:
UseAutoCheck(StringRef Name, ClangTidyContext *Context);
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
return LangOpts.CPlusPlus;
return LangOpts.CPlusPlus11;
}
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/modernize/UseEqualsDeleteCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class UseEqualsDeleteCheck : public ClangTidyCheck {
public:
UseEqualsDeleteCheck(StringRef Name, ClangTidyContext *Context);
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
return LangOpts.CPlusPlus;
return LangOpts.CPlusPlus11;
}
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
Expand Down
4 changes: 1 addition & 3 deletions clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ class UseNullptrCheck : public ClangTidyCheck {
public:
UseNullptrCheck(StringRef Name, ClangTidyContext *Context);
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
// FIXME this should be CPlusPlus11 but that causes test cases to
// erroneously fail.
return LangOpts.CPlusPlus || LangOpts.C23;
return LangOpts.CPlusPlus11 || LangOpts.C23;
}
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
Expand Down
130 changes: 31 additions & 99 deletions clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-basic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
// RUN: %check_clang_tidy -std=c++98 %s modernize-use-nullptr %t -- -- -Wno-non-literal-null-conversion
//
// Some parts of the test (e.g. assignment of `const int` to `int *`) fail in
// C++11, so we need to run the test in C++98 mode.
//
// FIXME: Make the test work in all language modes.
// RUN: %check_clang_tidy %s modernize-use-nullptr %t -- -- -fno-delayed-template-parsing

const unsigned int g_null = 0;
#define NULL 0
Expand All @@ -23,26 +18,19 @@ void test_assignment() {
p2 = p1;
// CHECK-FIXES: p2 = p1;

const int null = 0;
int *p3 = null;
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use nullptr
// CHECK-FIXES: int *p3 = nullptr;

int *p3;
p3 = NULL;
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: use nullptr
// CHECK-FIXES: p3 = nullptr;

int *p4 = p3;
// CHECK-FIXES: int *p4 = p3;

p4 = null;
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: use nullptr
// CHECK-FIXES: p4 = nullptr;

int i1 = 0;

int i2 = NULL;

const int null = 0;
int i3 = null;

int *p5, *p6, *p7;
Expand Down Expand Up @@ -70,47 +58,13 @@ int *Foo::m_p2 = NULL;
// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: use nullptr
// CHECK-FIXES: int *Foo::m_p2 = nullptr;

template <typename T>
struct Bar {
Bar(T *p) : m_p(p) {
m_p = static_cast<T*>(NULL);
// CHECK-MESSAGES: :[[@LINE-1]]:27: warning: use nullptr
// CHECK-FIXES: m_p = static_cast<T*>(nullptr);

m_p = static_cast<T*>(reinterpret_cast<int*>((void*)NULL));
// CHECK-MESSAGES: :[[@LINE-1]]:27: warning: use nullptr
// CHECK-FIXES: m_p = static_cast<T*>(nullptr);

m_p = static_cast<T*>(p ? p : static_cast<void*>(g_null));
// CHECK-MESSAGES: :[[@LINE-1]]:54: warning: use nullptr
// CHECK-FIXES: m_p = static_cast<T*>(p ? p : static_cast<void*>(nullptr));

T *p2 = static_cast<T*>(reinterpret_cast<int*>((void*)NULL));
// CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use nullptr
// CHECK-FIXES: T *p2 = static_cast<T*>(nullptr);

m_p = NULL;
// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: use nullptr
// CHECK-FIXES: m_p = nullptr;

int i = static_cast<int>(0.f);
T *i2 = static_cast<int>(0.f);
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use nullptr
// CHECK-FIXES: T *i2 = nullptr;
}

T *m_p;
};

struct Baz {
Baz() : i(0) {}
int i;
};

void test_cxx_cases() {
Foo f(g_null);
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: use nullptr
// CHECK-FIXES: Foo f(nullptr);
Foo f;

f.bar(NULL);
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: use nullptr
Expand All @@ -122,10 +76,6 @@ void test_cxx_cases() {
// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: use nullptr
// CHECK-FIXES: f.m_p1 = nullptr;

Bar<int> b(g_null);
// CHECK-MESSAGES: :[[@LINE-1]]:14: warning: use nullptr
// CHECK-FIXES: Bar<int> b(nullptr);

Baz b2;
int Baz::*memptr(0);
// CHECK-MESSAGES: :[[@LINE-1]]:20: warning: use nullptr
Expand All @@ -144,10 +94,6 @@ void test_function_default_param2(void *p = NULL);
// CHECK-MESSAGES: :[[@LINE-1]]:45: warning: use nullptr
// CHECK-FIXES: void test_function_default_param2(void *p = nullptr);

void test_function_default_param3(void *p = g_null);
// CHECK-MESSAGES: :[[@LINE-1]]:45: warning: use nullptr
// CHECK-FIXES: void test_function_default_param3(void *p = nullptr);

void test_function(int *p) {}

void test_function_no_ptr_param(int i) {}
Expand All @@ -161,10 +107,6 @@ void test_function_call() {
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use nullptr
// CHECK-FIXES: test_function(nullptr);

test_function(g_null);
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use nullptr
// CHECK-FIXES: test_function(nullptr);

test_function_no_ptr_param(0);
}

Expand All @@ -180,51 +122,33 @@ void *test_function_return2() {
// CHECK-FIXES: return nullptr;
}

long *test_function_return3() {
return g_null;
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use nullptr
// CHECK-FIXES: return nullptr;
}

int test_function_return4() {
int test_function_return3() {
return 0;
}

int test_function_return5() {
int test_function_return4() {
return NULL;
}

int test_function_return6() {
int test_function_return5() {
return g_null;
}

int *test_function_return_cast1() {
return(int)0;
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: use nullptr
// CHECK-FIXES: return nullptr;
}

int *test_function_return_cast2() {
int *test_function_return_cast() {
#define RET return
RET(int)0;
// CHECK-MESSAGES: :[[@LINE-1]]:6: warning: use nullptr
RET 0;
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use nullptr
// CHECK-FIXES: RET nullptr;
#undef RET
}

// Test parentheses expressions resulting in a nullptr.
int *test_parentheses_expression1() {
int *test_parentheses_expression() {
return(0);
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use nullptr
// CHECK-FIXES: return(nullptr);
}

int *test_parentheses_expression2() {
return(int(0.f));
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use nullptr
// CHECK-FIXES: return(nullptr);
}

int *test_nested_parentheses_expression() {
return((((0))));
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use nullptr
Expand All @@ -244,7 +168,7 @@ void *test_parentheses_explicit_cast_sequence1() {
}

void *test_parentheses_explicit_cast_sequence2() {
return(static_cast<void*>(reinterpret_cast<int*>((float*)int(0.f))));
return(static_cast<void*>(reinterpret_cast<int*>((float*)(0))));
// CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use nullptr
// CHECK-FIXES: return(static_cast<void*>(nullptr));
}
Expand Down Expand Up @@ -313,19 +237,13 @@ void test_const_pointers() {
const int *const_p2 = NULL;
// CHECK-MESSAGES: :[[@LINE-1]]:25: warning: use nullptr
// CHECK-FIXES: const int *const_p2 = nullptr;
const int *const_p3 = (int)0;
// CHECK-MESSAGES: :[[@LINE-1]]:25: warning: use nullptr
// CHECK-FIXES: const int *const_p3 = nullptr;
const int *const_p4 = (int)0.0f;
// CHECK-MESSAGES: :[[@LINE-1]]:25: warning: use nullptr
// CHECK-FIXES: const int *const_p4 = nullptr;
const int *const_p5 = (int*)0;
const int *const_p3 = (int*)0;
// CHECK-MESSAGES: :[[@LINE-1]]:31: warning: use nullptr
// CHECK-FIXES: const int *const_p5 = (int*)nullptr;
// CHECK-FIXES: const int *const_p3 = (int*)nullptr;
int *t;
const int *const_p6 = static_cast<int*>(t ? t : static_cast<int*>(0));
const int *const_p4 = static_cast<int*>(t ? t : static_cast<int*>(0));
// CHECK-MESSAGES: :[[@LINE-1]]:69: warning: use nullptr
// CHECK-FIXES: const int *const_p6 = static_cast<int*>(t ? t : static_cast<int*>(nullptr));
// CHECK-FIXES: const int *const_p4 = static_cast<int*>(t ? t : static_cast<int*>(nullptr));
}

void test_nested_implicit_cast_expr() {
Expand All @@ -348,7 +266,21 @@ void test_nested_implicit_cast_expr() {
template<typename T>
class A {
public:
A(T *p = NULL) {}
A(T *p = NULL) {
Ptr = static_cast<T*>(NULL);

Ptr = static_cast<T*>(reinterpret_cast<int*>((void*)NULL));
// CHECK-MESSAGES: :[[@LINE-1]]:27: warning: use nullptr
// CHECK-FIXES: Ptr = static_cast<T*>(nullptr);
// FIXME: a better fix-it is: Ptr = nullptr;

T *p2 = static_cast<T*>(reinterpret_cast<int*>((void*)NULL));
// CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use nullptr
// CHECK-FIXES: T *p2 = static_cast<T*>(nullptr);
// FIXME: a better fix-it is: T *p2 = nullptr;

Ptr = NULL;
}

void f() {
Ptr = NULL;
Expand Down