https://gcc.gnu.org/g:3fcd86e404cac6763e40ca032aff942a3da09666
commit 3fcd86e404cac6763e40ca032aff942a3da09666
Author: Arthur Cohen <arthur.co...@embecosm.com>
Date: Fri Jan 12 13:48:43 2024 +0100
expand: C++ify proc macro decls generation
This uses a stringstream instead of the older, better and more readable
`sprintf` version as the format overflow warning in current GCC is
overzealous and triggered on that code, despite the non-zero allocation.
Even using an unsigned value instead of a signed one for the `size`
variable caused issues, so switching to this is simpler.
gcc/rust/ChangeLog:
* expand/rust-proc-macro.cc: Use stringstream instead of sprintf.
* rust-system.h: Include <iomanip>.
Diff:
---
gcc/rust/expand/rust-proc-macro.cc | 18 +++++++-----------
gcc/rust/rust-system.h | 1 +
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/gcc/rust/expand/rust-proc-macro.cc
b/gcc/rust/expand/rust-proc-macro.cc
index c5bd87a05a51..e8618485b71d 100644
--- a/gcc/rust/expand/rust-proc-macro.cc
+++ b/gcc/rust/expand/rust-proc-macro.cc
@@ -14,12 +14,14 @@
// along with GCC; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+#include "rust-system.h"
#include "rust-diagnostics.h"
#include "rust-proc-macro.h"
#include "rust-session-manager.h"
#include "rust-lex.h"
#include "rust-token-converter.h"
#include "rust-attributes.h"
+
#ifndef _WIN32
#include <dlfcn.h>
#endif
@@ -178,17 +180,11 @@ load_macros (std::string path)
std::string
generate_proc_macro_decls_symbol (std::uint32_t stable_crate_id)
{
-#define PROC_MACRO_DECLS_FMT_ARGS
\
- "__gccrs_proc_macro_decls_%08x__", stable_crate_id
- // Size could be hardcoded since we know the input size but I elected to
- // calculate it everytime so we won't have any desync between code and data.
- int size = std::snprintf (nullptr, 0, PROC_MACRO_DECLS_FMT_ARGS);
- std::vector<char> buf;
- buf.resize (size + 1, '\0');
- std::sprintf (buf.data (), PROC_MACRO_DECLS_FMT_ARGS);
-#undef PROC_MACRO_DECLS_FMT_ARGS
-
- return std::string (buf.cbegin (), buf.cend ());
+ std::ostringstream stream;
+ stream << "__gccrs_proc_macro_decls_" << std::setfill ('0') << std::hex
+ << std::setw (8) << stable_crate_id << "__";
+
+ return stream.str ();
}
} // namespace Rust
diff --git a/gcc/rust/rust-system.h b/gcc/rust/rust-system.h
index 75fa39826b2f..6ee4531ebfa6 100644
--- a/gcc/rust/rust-system.h
+++ b/gcc/rust/rust-system.h
@@ -54,6 +54,7 @@
* before the macro magic of safe-ctype.h, which is included by
* system.h. */
#include <iostream>
+#include <iomanip>
#include "system.h"
#include "ansidecl.h"
