diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-09-03 09:34:00 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-09-12 17:36:19 +0200 |
| commit | 53a4def0dc1aac39d592a0d20e9ec16e8b5574ac (patch) | |
| tree | 07f8634e6b03e824d2e0db70e2f8ad9e52200153 /gcc | |
| parent | b195fae7c11b35c8ee551cd302e3daf8e08c78d0 (diff) | |
| download | gcc-53a4def0dc1aac39d592a0d20e9ec16e8b5574ac.zip gcc-53a4def0dc1aac39d592a0d20e9ec16e8b5574ac.tar.gz gcc-53a4def0dc1aac39d592a0d20e9ec16e8b5574ac.tar.bz2 | |
d: Don't include terminating null pointer in string expression conversion (PR102185)
This gets re-added by the ExprVisitor when lowering StringExp back into a
STRING_CST during the code generator pass.
PR d/102185
gcc/d/ChangeLog:
* d-builtins.cc (d_eval_constant_expression): Don't include
terminating null pointer in string expression conversion.
gcc/testsuite/ChangeLog:
* gdc.dg/pr102185.d: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/d/d-builtins.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.dg/pr102185.d | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc index ab39d69..33347a1 100644 --- a/gcc/d/d-builtins.cc +++ b/gcc/d/d-builtins.cc @@ -380,7 +380,7 @@ d_eval_constant_expression (const Loc &loc, tree cst) else if (code == STRING_CST) { const void *string = TREE_STRING_POINTER (cst); - size_t len = TREE_STRING_LENGTH (cst); + size_t len = TREE_STRING_LENGTH (cst) - 1; return StringExp::create (loc, CONST_CAST (void *, string), len); } else if (code == VECTOR_CST) diff --git a/gcc/testsuite/gdc.dg/pr102185.d b/gcc/testsuite/gdc.dg/pr102185.d new file mode 100644 index 0000000..39823a3 --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr102185.d @@ -0,0 +1,7 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102185 +// { dg-do compile } + +static assert(__traits(getTargetInfo, "floatAbi").length == 0 || + __traits(getTargetInfo, "floatAbi") == "hard" || + __traits(getTargetInfo, "floatAbi") == "soft" || + __traits(getTargetInfo, "floatAbi") == "softfp"); |