diff options
| author | Andi Kleen <ak@linux.intel.com> | 2024-06-12 06:59:37 -0700 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2024-06-12 08:24:07 -0700 |
| commit | bd6bc352d96304a13da63fed6aeb1615be535fd7 (patch) | |
| tree | 5658d790c7d45b79745a4d889df1b27acb0a1af8 /gcc | |
| parent | bd3a312728fbf8c35a09239b9180269f938f872e (diff) | |
| download | gcc-bd6bc352d96304a13da63fed6aeb1615be535fd7.zip gcc-bd6bc352d96304a13da63fed6aeb1615be535fd7.tar.gz gcc-bd6bc352d96304a13da63fed6aeb1615be535fd7.tar.bz2 | |
Move cexpr_stree tree string build into utility function
No semantics changes.
gcc/cp/ChangeLog:
* cp-tree.h (extract): Add new overload to return tree.
* parser.cc (cp_parser_asm_string_expression): Use tree extract.
* semantics.cc (cexpr_str::extract): Add new overload to return
tree.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/cp-tree.h | 1 | ||||
| -rw-r--r-- | gcc/cp/parser.cc | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.cc | 14 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 62718ff..416c60b 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -9026,6 +9026,7 @@ public: bool type_check (location_t location); bool extract (location_t location, const char * & msg, int &len); + bool extract (location_t location, tree &str); tree message; private: tree message_data = NULL_TREE; diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 6cd7274..de5f048 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -22862,12 +22862,9 @@ cp_parser_asm_string_expression (cp_parser *parser) cexpr_str cstr (string); if (!cstr.type_check (tok->location)) return error_mark_node; - const char *msg; - int len; - if (!cstr.extract (tok->location, msg, len)) + if (!cstr.extract (tok->location, string)) return error_mark_node; parens.require_close (parser); - string = build_string (len, msg); return string; } else if (!cp_parser_is_string_literal (tok)) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 20f4675..08f5f24 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -11728,6 +11728,20 @@ cexpr_str::type_check (location_t location) return true; } +/* Extract constant string at LOCATON into output string STR. + Returns true if successful, otherwise false. */ + +bool +cexpr_str::extract (location_t location, tree &str) +{ + const char *msg; + int len; + if (!extract (location, msg, len)) + return false; + str = build_string (len, msg); + return true; +} + /* Extract constant string at LOCATION into output string MSG with LEN. Returns true if successful, otherwise false. */ |