[clang-tidy] Extract string header from redundant-string-cstr checker

[mikecrowe]

Summary

In preparation for using the implementation of basic_string and
basic_string_view from redundant-string-cstr.cpp in other checks, let's
extract it to a header.

Using the existing <string.h> to provide size_t, using that to define
size_type and using it rather than the previous "size" type makes it
easier to provide the size() method later and makes the implementation
closer to the standard.

[Eugene.Zelenko]

May be you could use heard in other test in same patch?

[carlosgalvezp]

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp

1

Where does this come from? Other tests use the actual path to the folder.

[mikecrowe]

In D144216#4133671, @Eugene.Zelenko wrote:

May be you could use heard in other test in same patch?

I'm not quite sure what you mean by "heard". Searching for "heard" in the LLVM code and Googling "llvm heard" reveal nothing useful. Please can you explain what you mean?

If you're suggesting that I could use the new <string> header to replace declarations of basic_string etc. in other tests then I think that would be possible with some careful checking to make sure it include the necessary functionality. I think that would easier to review separately rather than in a single patch though.

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp

1

I copied it from other checks:

clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c:// RUN: -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c:// RUN: -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c:// RUN: %check_clang_tidy %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp:// RUN: %check_clang_tidy -std=c++14 %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers -isystem %S/Inputs/signal-handler -target x86_64-unknown-unknown
clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp:// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %clang_tidy_headers -fmodules
clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m:// RUN: %check_clang_tidy %s google-objc-function-naming %t -- -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp:// RUN: %check_clang_tidy %s llvm-include-order %t -- -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-macro-header.cpp:// RUN: %check_clang_tidy %s modernize-pass-by-value %t -- -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp:// RUN: -- -isystem %clang_tidy_headers
clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-format.cpp:// RUN: %check_clang_tidy -check-suffix=STDFORMAT -std=c++20 %s readability-redundant-string-cstr %t -- --  -isystem %clang_tidy_headers -DTEST_STDFORMAT
clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-format.cpp:// RUN: %check_clang_tidy -check-suffixes=STDFORMAT,STDPRINT -std=c++2b %s readability-redundant-string-cstr %t -- --  -isystem %clang_tidy_headers -DTEST_STDFORMAT -DTEST_STDPRINT
clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp:// RUN: %check_clang_tidy %s readability-redundant-string-cstr %t -- -- -isystem %clang_tidy_headers

It seems to work!

[mikecrowe]

If you're suggesting that I could use the new <string> header to replace declarations of basic_string etc. in other tests then I think that would be possible with some careful checking to make sure it include the necessary functionality. I think that would easier to review separately rather than in a single patch though.

I had a quick look at likely candidates:

• abseil/redundant-strcat-calls.cpp appears to declare basic_string outside the std namespace and inside it, and does some strange stuff with a base class. If I rip all that out, and replace uses of string with std::string then the tests pass using <string>.
• readability/string-compare.cpp and readability/container-data-pointer.cpp require some tweaks to <string> but are straightforward.
• There may be complications if MSVC differs in its std::basic_string implementation in ways that the -msvc tests care about, but I didn't spot any.

So, it looks like the use of this new <string> header could be extended. Do you have a preference for one big patch, one patch per directory (abseil, readability), or one patch per check? Do you require all to be complete before even this patch can be accepted?

[carlosgalvezp]

Fair enough! I think we should merge this patch as is first, so that people can benefit from it already, and work through the technical debt afterwards.

[mikecrowe]

In D144216#4135431, @carlosgalvezp wrote:

Fair enough! I think we should merge this patch as is first, so that people can benefit from it already, and work through the technical debt afterwards.

Great. Thank you. I'm still interested in answers to the questions in my comment since I have the necessary changes to migrate the tests I mentioned to using <string> ready and I'd be happy to have a go at migrating more.

Thanks.

Mike.

[carlosgalvezp]

In D144216#4135395, @mikecrowe wrote:

If you're suggesting that I could use the new <string> header to replace declarations of basic_string etc. in other tests then I think that would be possible with some careful checking to make sure it include the necessary functionality. I think that would easier to review separately rather than in a single patch though.

I had a quick look at likely candidates:

• abseil/redundant-strcat-calls.cpp appears to declare basic_string outside the std namespace and inside it, and does some strange stuff with a base class. If I rip all that out, and replace uses of string with std::string then the tests pass using <string>.
• readability/string-compare.cpp and readability/container-data-pointer.cpp require some tweaks to <string> but are straightforward.
• There may be complications if MSVC differs in its std::basic_string implementation in ways that the -msvc tests care about, but I didn't spot any.

So, it looks like the use of this new <string> header could be extended. Do you have a preference for one big patch, one patch per directory (abseil, readability), or one patch per check? Do you require all to be complete before even this patch can be accepted?

If it's possible to re-use this new string header into the other checks that would be ideal. After all, in the real world there's only one string header. If it's a drop-in replacement I think it's fine to do multiple checks in one patch. Otherwise if the check / string header needs tweak it's probably better to do one check at a time.

[mikecrowe]

This new version uses size_t and size_type rather than the annoyingly-named "size" type that the old implementation in redundant-string-cstr.cpp used and is the basis for using the new <string> header in four further checks to be submitted as separate changes.

[mikecrowe]

The changes that extend the <string> header further and use it in a few more checks are:

• https://reviews.llvm.org/D145310
• https://reviews.llvm.org/D145311
• https://reviews.llvm.org/D145312
• https://reviews.llvm.org/D145313

and of course my original change:

• https://reviews.llvm.org/D143342

[carlosgalvezp]

Sounds good, should we land this? If you don't have commit rights, please let us know Github name and email for attribution.

[mikecrowe]

Sounds good, should we land this?

If you're happy to do so, then so am I.

If you don't have commit rights, please let us know Github name and email for attribution.

These are my first code contributions to LLVM, so I don't really know the process. I don't believe that I have commit rights. My GitHub username is "mikecrowe" and my email address is "[e-mail]".

Thanks!

Mike.

[carlosgalvezp]

clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string

5–6

Sorry I just noticed this - should we keep using the __SYZE_TYPE__ macro that existed in the previous patch? The purpose of this header is to not include any standard header, and yet this is done in line 5 so it kinda defeats the purpose.

I.e add the following under line 8:

typedef __SIZE_TYPE__ size_t

And then use that in line 17.

[mikecrowe]

The purpose of this header is to not include any standard header, and yet this is done in line 5 so it kinda defeats the purpose.

I believe that this <string> header is including clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string.h rather than the system string.h header. (That's why I'm including string.h to get size_t rather than the more obvious stdlib.h.) If we're going to have sets of "standard-but-not-standard" headers for these checks then it feels like it ought to be safe to use them.

I will double check that this is true once my current build is complete.

Mike.

[mikecrowe]

I will double check that this is true once my current build is complete.

Yes, it's true. I stuck a #error in clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string.h and I saw the expected error from a file including <string>.

[carlosgalvezp]

In D144216#4169764, @mikecrowe wrote:

I will double check that this is true once my current build is complete.

Yes, it's true. I stuck a #error in clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string.h and I saw the expected error from a file including <string>.

Awesome, thanks for checking, I wasn't aware we already had string.h. Then if we do have headers named the same as the standard headers, would it make sense to name this header cstring instead of string?

[mikecrowe]

In D144216#4169772, @carlosgalvezp wrote:

In D144216#4169764, @mikecrowe wrote:

I will double check that this is true once my current build is complete.

Yes, it's true. I stuck a #error in clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string.h and I saw the expected error from a file including <string>.

Awesome, thanks for checking, I wasn't aware we already had string.h. Then if we do have headers named the same as the standard headers, would it make sense to name this header cstring instead of string?

I think you mean rename string.h to cstring. (string clearly has to be just string if it's the standard C++ string header.)

A bit of searching in the existing checks shows that string.h is included by C checks (bugprone/signal-handler*.c) and also by checks that deliberately want string.h so they can suggest switching to cstring (modernize/deprecated-headers*) so it looks like it's necessary to keep string.h. If you wish, a cstring wrapper that just includes string.h could be created, but it really ought to put everything in namespace std too. (If so, I think this would probably be better done as a separate change.)

[carlosgalvezp]

In D144216#4169781, @mikecrowe wrote:

In D144216#4169772, @carlosgalvezp wrote:

In D144216#4169764, @mikecrowe wrote:

I will double check that this is true once my current build is complete.

Yes, it's true. I stuck a #error in clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string.h and I saw the expected error from a file including <string>.

Awesome, thanks for checking, I wasn't aware we already had string.h. Then if we do have headers named the same as the standard headers, would it make sense to name this header cstring instead of string?

I think you mean rename string.h to cstring. (string clearly has to be just string if it's the standard C++ string header.)

A bit of searching in the existing checks shows that string.h is included by C checks (bugprone/signal-handler*.c) and also by checks that deliberately want string.h so they can suggest switching to cstring (modernize/deprecated-headers*) so it looks like it's necessary to keep string.h. If you wish, a cstring wrapper that just includes string.h could be created, but it really ought to put everything in namespace std too. (If so, I think this would probably be better done as a separate change.)

You are absolutely right, I don't know why I mixed cstring with string, nevermind! Pushed now, will look at the follow up patches soon. Thanks again for the fix!

clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/string

+#ifndef _STRING_
+#define _STRING_
+
+typedef unsigned __INT16_TYPE__ char16;
+typedef unsigned __INT32_TYPE__ char32;
+typedef __SIZE_TYPE__ size;
+
+namespace std {
+template <typename T>
+class allocator {};
+template <typename T>
+class char_traits {};
+template <typename C, typename T, typename A>
+struct basic_string {
+  typedef basic_string<C, T, A> _Type;
+  basic_string();
+  basic_string(const C *p, const A &a = A());
+
+  ~basic_string();
+
+  const C *c_str() const;
+  const C *data() const;
+
+  _Type& append(const C *s);
+  _Type& append(const C *s, size n);
+  _Type& assign(const C *s);
+  _Type& assign(const C *s, size n);
+
+  int compare(const _Type&) const;
+  int compare(const C* s) const;
+  int compare(size pos, size len, const _Type&) const;
+  int compare(size pos, size len, const C* s) const;
+
+  size find(const _Type& str, size pos = 0) const;
+  size find(const C* s, size pos = 0) const;
+  size find(const C* s, size pos, size n) const;
+
+  _Type& insert(size pos, const _Type& str);
+  _Type& insert(size pos, const C* s);
+  _Type& insert(size pos, const C* s, size n);
+
+  _Type& operator+=(const _Type& str);
+  _Type& operator+=(const C* s);
+  _Type& operator=(const _Type& str);
+  _Type& operator=(const C* s);
+};
+
+typedef basic_string<char, std::char_traits<char>, std::allocator<char>> string;
+typedef basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>> wstring;
+typedef basic_string<char16, std::char_traits<char16>, std::allocator<char16>> u16string;
+typedef basic_string<char32, std::char_traits<char32>, std::allocator<char32>> u32string;
+
+template <typename C, typename T>
+struct basic_string_view {
+  basic_string_view(const C* s);
+};
+typedef basic_string_view<char, std::char_traits<char>> string_view;
+typedef basic_string_view<wchar_t, std::char_traits<wchar_t>> wstring_view;
+typedef basic_string_view<char16, std::char_traits<char16>> u16string_view;
+typedef basic_string_view<char32, std::char_traits<char32>> u32string_view;
+}
+
+std::string operator+(const std::string&, const std::string&);
+std::string operator+(const std::string&, const char*);
+std::string operator+(const char*, const std::string&);
+
+bool operator==(const std::string&, const std::string&);
+bool operator==(const std::string&, const char*);
+bool operator==(const char*, const std::string&);
+
+#endif // _STRING_

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp

-// RUN: %check_clang_tidy %s readability-redundant-string-cstr %t
-
-typedef unsigned __INT16_TYPE__ char16;
-typedef unsigned __INT32_TYPE__ char32;
-typedef __SIZE_TYPE__ size;
-
-namespace std {
-template <typename T>
-class allocator {};
-template <typename T>
-class char_traits {};
-template <typename C, typename T, typename A>
-struct basic_string {
-  typedef basic_string<C, T, A> _Type;
-  basic_string();
-  basic_string(const C *p, const A &a = A());
-
-  ~basic_string();
-
-  const C *c_str() const;
-  const C *data() const;
-
-  _Type& append(const C *s);
-  _Type& append(const C *s, size n);
-  _Type& assign(const C *s);
-  _Type& assign(const C *s, size n);
-
-  int compare(const _Type&) const;
-  int compare(const C* s) const;
-  int compare(size pos, size len, const _Type&) const;
-  int compare(size pos, size len, const C* s) const;
-
-  size find(const _Type& str, size pos = 0) const;
-  size find(const C* s, size pos = 0) const;
-  size find(const C* s, size pos, size n) const;
-
-  _Type& insert(size pos, const _Type& str);
-  _Type& insert(size pos, const C* s);
-  _Type& insert(size pos, const C* s, size n);
-
-  _Type& operator+=(const _Type& str);
-  _Type& operator+=(const C* s);
-  _Type& operator=(const _Type& str);
-  _Type& operator=(const C* s);
-};
-
-typedef basic_string<char, std::char_traits<char>, std::allocator<char>> string;
-typedef basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>> wstring;
-typedef basic_string<char16, std::char_traits<char16>, std::allocator<char16>> u16string;
-typedef basic_string<char32, std::char_traits<char32>, std::allocator<char32>> u32string;
-
-template <typename C, typename T>
-struct basic_string_view {
-  basic_string_view(const C* s);
-};
-typedef basic_string_view<char, std::char_traits<char>> string_view;
-typedef basic_string_view<wchar_t, std::char_traits<wchar_t>> wstring_view;
-typedef basic_string_view<char16, std::char_traits<char16>> u16string_view;
-typedef basic_string_view<char32, std::char_traits<char32>> u32string_view;
-}
-
-std::string operator+(const std::string&, const std::string&);
-std::string operator+(const std::string&, const char*);
-std::string operator+(const char*, const std::string&);
-
-bool operator==(const std::string&, const std::string&);
-bool operator==(const std::string&, const char*);
-bool operator==(const char*, const std::string&);
+// RUN: %check_clang_tidy %s readability-redundant-string-cstr %t -- -- -isystem %clang_tidy_headers
+#include <string>
 
 namespace llvm {
 struct StringRef {
   StringRef(const char *p);
   StringRef(const std::string &);
 };
 }