From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Helmut Eller Newsgroups: gmane.emacs.devel Subject: Re: MPS prstack Date: Wed, 22 May 2024 18:27:37 +0200 Message-ID: <874jap95hi.fsf@gmail.com> References: <87o790qsgm.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32147"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , Emacs Devel To: Gerd =?utf-8?Q?M=C3=B6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 22 18:28:48 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s9opc-0008C7-Lj for ged-emacs-devel@m.gmane-mx.org; Wed, 22 May 2024 18:28:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9oog-00045t-JW; Wed, 22 May 2024 12:27:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9ood-00044x-1m for emacs-devel@gnu.org; Wed, 22 May 2024 12:27:47 -0400 Original-Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9ooZ-0008Vk-Gq; Wed, 22 May 2024 12:27:46 -0400 Original-Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a59c0a6415fso1071185266b.1; Wed, 22 May 2024 09:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716395260; x=1717000060; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=fsU67Si5MN+GFzpeKr7QGrwFZ2Ho0HlD3uHaRVuQHn8=; b=SU6qSGSeWBGF0rcdTI/b1rn3wMx35D2wPK8w+FxeLAdmqnYitFDNi5KXiI+U8Vwo7d p61tf7LCkGDEBDhEBPnFabt/WWm3zPcJYd7l5gD/0x4MaaKn2LTi94AH+kE+hGcd1bGi 2tAlQKc2rl0Ujf9T2yD2G4mo5iGFTSDdM9vlU7jRae6bQfZdJgr3oiELN0hc9VFIbRmp sNjiHygsvXUDU7jWuhwztD+2WB6jPlNV/lZxu5aRsgTAjxL+cahtfzvuB5Vj7Q2V96z4 p/tl+lgJrhShfu+XQYty7ZTHt49JXHOqjAqBUEXIe3JXw8KrloeJcO65cZ9ZTlsEulkv 1uMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716395260; x=1717000060; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fsU67Si5MN+GFzpeKr7QGrwFZ2Ho0HlD3uHaRVuQHn8=; b=qrNYAfcqMU+WeFffNlc9kJeUkbnL0pdQoL5WRwhi3E67rbFY/wIBvzszUJjxWhIkUk c0p/fsW7kiXhb+a/JDtAJqVm2kB4fp14Nkm6ukh5IIvn6zqoOVKNbMae8jKAbMt7nxcC /adgl7A14+tcs6FOSGHC2RM7UKB0QPdrrREOFPSxQBV0ZlYwoBbMQ3l2oeAv/hFm8Why VnW9giLjHNdSb/2aG5Zbcz5kLviSq3A8x6g2bboyVH0/1wJRGTOTdqf0RpLJl9vsdx4k Z1EgNvk/g/2gI/7m/zBxH9pLZULehO60Cx7TSMyhO1zWc2CVVYpUnpv4RO0Uc7D5I32v c90w== X-Forwarded-Encrypted: i=1; AJvYcCWHkL5rW2tFPnF5DJHYgponLGH797hlfFSgulIHwMD4irVmOieP5GVsKg5GqFz4NDzJmAxk530TKQGTIqP6lmGQFG0O X-Gm-Message-State: AOJu0YxcDk7tyhVBrf5mofqpM7UIrxrv0AKEX5zVDegJUOc8NO/K+Dqf rYJIAJf9xFduLH4mn7ciYgYVRm76kijHavGfsnfjxhSb4osyW3YDe3B8ew== X-Google-Smtp-Source: AGHT+IHK6r6qOtPtWSqOjGQDzgnqk6tlhoREWWwBYfGnvXftkMWQNrotCBPSYy0FHXCtvrdItZ23cw== X-Received: by 2002:a17:906:e217:b0:a55:adec:7139 with SMTP id a640c23a62f3a-a62281636abmr169317066b.60.1716395259682; Wed, 22 May 2024 09:27:39 -0700 (PDT) Original-Received: from caladan (dial-188233.pool.broadband44.net. [212.46.188.233]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5ce2eabad1sm918652666b.202.2024.05.22.09.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 09:27:39 -0700 (PDT) In-Reply-To: <87o790qsgm.fsf@gmail.com> (Helmut Eller's message of "Mon, 20 May 2024 19:54:49 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=eller.helmut@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:319488 Archived-At: --=-=-= Content-Type: text/plain On Mon, May 20 2024, Helmut Eller wrote: > In print.c, there is a global variable prstack that is not yet scanned. > This causes a crash for comp-tests but this example triggers the same > problem: There is another one: ppstack. I wasn't able to create a small test case for this but ppstack is needed when print-circle=t. The native compiler uses that a lot. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Make-ppstack-an-exact-root.patch >From 61943bbd287efaa8ebf9994be1d536d82456072e Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 22 May 2024 15:03:41 +0200 Subject: [PATCH] Make ppstack an exact root * src/print.c (grow_pp_stack): Use igc_xpalloc_exact. (scan_ppstack): New. --- src/print.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/print.c b/src/print.c index f043da92c1f..c87597be899 100644 --- a/src/print.c +++ b/src/print.c @@ -1326,12 +1326,44 @@ #define PRINT_CIRCLE_CANDIDATE_P(obj) \ static struct print_pp_stack ppstack = {NULL, 0, 0}; +static igc_scan_result_t +scan_ppstack (struct igc_opaque *op, void *start, void *end, + igc_scan_cell_t scan1) +{ + eassert (start == (void *)ppstack.stack); + eassert (end == (void *)(ppstack.stack + ppstack.size)); + struct print_pp_entry *p = start; + struct print_pp_entry *q = p + ppstack.sp; + for (; p < q; p++) + { + igc_scan_result_t err = 0; + if (p->n == 0) + { + if (err = scan1 (op, &p->u.value), err != 0) + return err; + } + else + { + eassert (p->n > 0); + for (size_t i = 0; i < p->n; i++) + if (err = scan1 (op, &p->u.values[i]), err != 0) + return err; + } + } + return 0; +} + NO_INLINE static void grow_pp_stack (void) { struct print_pp_stack *ps = &ppstack; eassert (ps->sp == ps->size); +#ifdef HAVE_MPS + ps->stack = igc_xpalloc_exact (ps->stack, &ps->size, 1, -1, + sizeof *ps->stack, scan_ppstack); +#else ps->stack = xpalloc (ps->stack, &ps->size, 1, -1, sizeof *ps->stack); +#endif eassert (ps->sp < ps->size); } -- 2.39.2 --=-=-=--