Revert "[lldb] Avoid format string in LLDB_SCOPED_TIMER"
authorJonas Devlieghere <jonas@devlieghere.com>
Wed, 26 May 2021 00:21:01 +0000 (17:21 -0700)
committerJonas Devlieghere <jonas@devlieghere.com>
Wed, 26 May 2021 00:22:51 +0000 (17:22 -0700)
Right after pushing, I remembered that this was added to silence a GCC
warning (https://reviews.llvm.org/D99120). This reverts my patch and
adds a comment.

lldb/include/lldb/Utility/Timer.h

index edc064b..0249c69 100644 (file)
@@ -74,9 +74,11 @@ private:
 
 } // namespace lldb_private
 
+// Use a format string because LLVM_PRETTY_FUNCTION might not be a string
+// literal.
 #define LLDB_SCOPED_TIMER()                                                    \
   static ::lldb_private::Timer::Category _cat(LLVM_PRETTY_FUNCTION);           \
-  ::lldb_private::Timer _scoped_timer(_cat, LLVM_PRETTY_FUNCTION)
+  ::lldb_private::Timer _scoped_timer(_cat, "%s", LLVM_PRETTY_FUNCTION)
 #define LLDB_SCOPED_TIMERF(...)                                                \
   static ::lldb_private::Timer::Category _cat(LLVM_PRETTY_FUNCTION);           \
   ::lldb_private::Timer _scoped_timer(_cat, __VA_ARGS__)