From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1873) id 96B393858408; Sun, 12 Sep 2021 15:47:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96B393858408 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain Buclaw To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-8982] d: Don't include terminating null pointer in string expression conversion (PR102185) X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 2ae73531d3395dcb617b31948f3b30ff2fdaa5e8 X-Git-Newrev: 09a2049123e242aaf8a4bbfa8eb3ce92901b6f4e Message-Id: <20210912154714.96B393858408@sourceware.org> Date: Sun, 12 Sep 2021 15:47:14 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2021 15:47:14 -0000 https://gcc.gnu.org/g:09a2049123e242aaf8a4bbfa8eb3ce92901b6f4e commit r11-8982-g09a2049123e242aaf8a4bbfa8eb3ce92901b6f4e Author: Iain Buclaw Date: Fri Sep 3 09:34:00 2021 +0200 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. (cherry picked from commit 53a4def0dc1aac39d592a0d20e9ec16e8b5574ac) Diff: --- gcc/d/d-builtins.cc | 2 +- gcc/testsuite/gdc.dg/pr102185.d | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc index 6d294697223..9d40cbc5a0b 100644 --- a/gcc/d/d-builtins.cc +++ b/gcc/d/d-builtins.cc @@ -369,7 +369,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 00000000000..39823a3c556 --- /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");