From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) by sourceware.org (Postfix) with ESMTPS id 489253858D1E for ; Wed, 30 Nov 2022 17:13:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 489253858D1E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=gdcproject.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gdcproject.org Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4NMm4X4jSlz9sTZ; Wed, 30 Nov 2022 18:13:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gdcproject.org; s=MBO0001; t=1669828396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UILdvHHLtE4IdzRCYkUU5UMeflbqFEJOLiNDtMUyFno=; b=o0X2nGIsavrPj+OZ0vqq0xxsdvwYEQznSdNnIiTi8Vwxb+qvCILrlchrPXfQCY5d37fL1q qXkI3j9pc9r93yVguabGo5K1IiG+zSU0tuz71YrXV83WDFxO5YyGt9krtLeStBGTghXIVj BNrLWXnIcKERlr2Rq2SR4pV01rvJjpqlEnfZKGCcaOHP9Z9WWT4lcOSJWcBcobfkVpR6TZ ewyi2M+/OQjAFYKuzwKD+tZKB+43KJjOoWutfL26TV0LEeTpH66yeffYT+30xy7VmXj/y2 RQQhMRn4Oj/FWe1b7AO+pswnebPbiSyn2Pip3V3m+/OtzAOupb/B5jlbtRn4cw== From: Iain Buclaw To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Fix ICE on named continue label in an unrolled loop [PR107592] Date: Wed, 30 Nov 2022 18:13:14 +0100 Message-Id: <20221130171314.323962-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi, This patch fixes an ICE with using `continue' on a named label in an unrolled loop statement. 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' Bootstrapped and regression tested on x86_64-linux-gnu/-m32/-mx32, and committed to mainline, and backported to previous release branches. Regards Iain. --- 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. --- gcc/d/toir.cc | 26 ++++++++++++++++++++++++-- gcc/testsuite/gdc.dg/pr107592.d | 13 +++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gdc.dg/pr107592.d diff --git a/gcc/d/toir.cc b/gcc/d/toir.cc index e5f5751f6db..e387f27760d 100644 --- a/gcc/d/toir.cc +++ b/gcc/d/toir.cc @@ -529,6 +529,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. */ @@ -1089,9 +1111,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); -- 2.37.2