From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1873) id 543AC3858D1E; Wed, 30 Nov 2022 21:02:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 543AC3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669842179; bh=dueewTylH6/LSNrq0DpPesAn8pciV1Bwk337XUBYqLs=; h=From:To:Subject:Date:From; b=aUFz3/hqZDaM+kduidT7qXns2XeX3/JFsLvnQ+ksxWDd42soLq0Bm98wBVn/YiFVG FdzGMsXt1nzTd52Kl/vao9aWjds6p8plK9XbdvTj+thsouqOWHEPu4jLg28Jr/F+LW uDxdemQxJrGsd/FJJqqG1rGd3GS/zUUmFGApev64= 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-10402] d: Fix ICE on named continue label in an unrolled loop [PR107592] X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: edad87c2693e3ab42f17c4d6d7b58116ccb6fc46 X-Git-Newrev: 7bb5b326796af7d688c9976fba7ba3c2706481a0 Message-Id: <20221130210259.543AC3858D1E@sourceware.org> Date: Wed, 30 Nov 2022 21:02:59 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7bb5b326796af7d688c9976fba7ba3c2706481a0 commit r11-10402-g7bb5b326796af7d688c9976fba7ba3c2706481a0 Author: Iain Buclaw Date: Sat Nov 12 00:54:47 2022 +0100 d: Fix ICE on named continue label in an unrolled loop [PR107592] Continue labels in an unrolled loop require a unique label per iteration. Previously this used the Statement body node for each unrolled iteration to generate a new entry in the label hash table. This does not work when the continue label has an identifier, as said named label is pointing to the outer UnrolledLoopStatement node. What would happen is that during the lowering of `continue label', an automatic label associated with the unrolled loop would be generated, and a jump to that label inserted, but because it was never pushed by the visitor for the loop itself, it subsequently never gets emitted. To fix, correctly use the UnrolledLoopStatement as the key to look up and store the break/continue label pair, but remove the continue label from the value entry after every loop to force a new label to be generated by the next call to `push_continue_label' PR d/107592 gcc/d/ChangeLog: * toir.cc (IRVisitor::push_unrolled_continue_label): New method. (IRVisitor::pop_unrolled_continue_label): New method. (IRVisitor::visit (UnrolledLoopStatement *)): Use them instead of push_continue_label and pop_continue_label. gcc/testsuite/ChangeLog: * gdc.dg/pr107592.d: New test. (cherry picked from commit 031d3f095520f0e1ee03e29b7ad5067c2a3f96e0) Diff: --- gcc/d/toir.cc | 26 ++++++++++++++++++++++++-- gcc/testsuite/gdc.dg/pr107592.d | 13 +++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/gcc/d/toir.cc b/gcc/d/toir.cc index 460edc15143..1db50b8cfbe 100644 --- a/gcc/d/toir.cc +++ b/gcc/d/toir.cc @@ -541,6 +541,28 @@ public: this->do_label (label); } + /* Generate and set a new continue label for the current unrolled loop. */ + + void push_unrolled_continue_label (UnrolledLoopStatement *s) + { + this->push_continue_label (s); + } + + /* Finish with the continue label for the unrolled loop. */ + + void pop_unrolled_continue_label (UnrolledLoopStatement *s) + { + Statement *stmt = s->getRelatedLabeled (); + d_label_entry *ent = d_function_chain->labels->get (stmt); + gcc_assert (ent != NULL && ent->bc_label == true); + + this->pop_continue_label (TREE_VEC_ELT (ent->label, bc_continue)); + + /* Remove the continue label from the label htab, as a new one must be + inserted at the end of every unrolled loop. */ + ent->label = TREE_VEC_ELT (ent->label, bc_break); + } + /* Visitor interfaces. */ @@ -1157,9 +1179,9 @@ public: if (statement != NULL) { - tree lcontinue = this->push_continue_label (statement); + this->push_unrolled_continue_label (s); this->build_stmt (statement); - this->pop_continue_label (lcontinue); + this->pop_unrolled_continue_label (s); } } diff --git a/gcc/testsuite/gdc.dg/pr107592.d b/gcc/testsuite/gdc.dg/pr107592.d new file mode 100644 index 00000000000..59f34477356 --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr107592.d @@ -0,0 +1,13 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107592 +// { dg-do compile } + +void test107592(Things...)(Things things) +{ + label: + foreach (thing; things) + { + continue label; + } +} + +alias a107592 = test107592!(string);