diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2023-10-14 02:19:41 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2023-10-14 13:52:30 +0200 |
| commit | 578afbc751d122b55196a23fe75a17e1b4e9bd0c (patch) | |
| tree | 7a293d2850ec9a375c5e9d1a1011f34b2cfbed55 /gcc/d | |
| parent | 06d8aee3aaa7928321acc6f7752aa5dee9661bf3 (diff) | |
| download | gcc-578afbc751d122b55196a23fe75a17e1b4e9bd0c.zip gcc-578afbc751d122b55196a23fe75a17e1b4e9bd0c.tar.gz gcc-578afbc751d122b55196a23fe75a17e1b4e9bd0c.tar.bz2 | |
Fix ICE in set_cell_span, at text-art/table.cc:148 with D front-end and -fanalyzer
The internal error in analyzer turned out to be caused by a subtly
invalid tree representation of STRING_CSTs in the D front-end, fixed by
including the terminating NULL as part of the TREE_STRING_POINTER.
When adding a first analyzer test for D, it flagged up another subtle
mismatch in one assignment in the module support routines as well, fixed
by generating the correct field type for the compiler-generated struct.
PR d/111537
gcc/d/ChangeLog:
* expr.cc (ExprVisitor::visit (StringExp *)): Include null terminator
in STRING_CST string.
* modules.cc (get_compiler_dso_type): Generate ModuleInfo** type for
the minfo fields.
gcc/testsuite/ChangeLog:
* gdc.dg/analyzer/analyzer.exp: New test.
* gdc.dg/analyzer/pr111537.d: New test.
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/expr.cc | 6 | ||||
| -rw-r--r-- | gcc/d/modules.cc | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc index 7038655..551d004 100644 --- a/gcc/d/expr.cc +++ b/gcc/d/expr.cc @@ -2535,13 +2535,13 @@ public: { /* Copy the string contents to a null terminated string. */ dinteger_t length = (e->len * e->sz); - char *string = XALLOCAVEC (char, length + 1); + char *string = XALLOCAVEC (char, length + e->sz); + memset (string, 0, length + e->sz); if (length > 0) memcpy (string, e->string, length); - string[length] = '\0'; /* String value and type includes the null terminator. */ - tree value = build_string (length, string); + tree value = build_string (length + e->sz, string); TREE_TYPE (value) = make_array_type (tb->nextOf (), length + 1); value = build_address (value); diff --git a/gcc/d/modules.cc b/gcc/d/modules.cc index f2180d3..8d6c8f0 100644 --- a/gcc/d/modules.cc +++ b/gcc/d/modules.cc @@ -277,12 +277,13 @@ get_compiler_dso_type (void) DECL_CHAIN (field) = fields; fields = field; - field = create_field_decl (build_pointer_type (get_moduleinfo_type ()), - NULL, 1, 1); + tree moduleinfo_ptr_ptr_type = + build_pointer_type (build_pointer_type (get_moduleinfo_type ())); + + field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1); DECL_CHAIN (field) = fields; fields = field; - field = create_field_decl (build_pointer_type (get_moduleinfo_type ()), - NULL, 1, 1); + field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1); DECL_CHAIN (field) = fields; fields = field; |