[prev in list] [next in list] [prev in thread] [next in thread]
List: sbcl-devel
Subject: Re: [Sbcl-devel] [Sbcl-commits] master: Don't unlink the combination fun in delete-block.
From: Stas Boukarev <stassats () gmail ! com>
Date: 2023-07-20 17:50:32
Message-ID: CAF63=138bhNFFsJb-2AO-F=8-hKXHGpv+zCfNO5V8GUMpJvYmw () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
debug-catch-tag? Probably just gotta ignore it.
On Thu, Jul 20, 2023 at 6:42 PM Douglas Katzman via Sbcl-devel <
sbcl-devel@lists.sourceforge.net> wrote:
> Any idea why ppc64 would say this? (Built at the most recent change which
> fixes failure-to-build)
>
> ::: UNEXPECTED-FAILURE :UNLINK-NODE-IN-DELETE-BLOCK due to SIMPLE-ERROR:
>
> "Compilation of
>
>
> (LAMBDA (B)
>
> (TAGBODY
>
> ((LAMBDA (V6)
>
> ((LAMBDA (A B &REST C) A B C (GO 7)) (CATCH 'CT8 0)
>
> (CASE B ((-424 -278) B) (T 0))))
>
> ((LAMBDA () (GO 7))))
>
> 7))
>
>
> with
>
>
> ((SPEED 0) (SAFETY 0) (DEBUG 3) (COMPILATION-SPEED 1) (SPACE
> 1))
>
>
> optimization policy signaled style-warning:
>
>
> SB-INT:SIMPLE-STYLE-WARNING: The variable V6 is defined but
> never used."
>
> On Thu, Jun 29, 2023 at 6:28 AM stassats via Sbcl-commits <
> sbcl-commits@lists.sourceforge.net> wrote:
>
>> The branch "master" has been updated in SBCL:
>> via 9af8e5821984ac52d2622e421125bc3c3e63b2ec (commit)
>> from 09e34ec745ae073d7ea178821d1a7a8f13c135df (commit)
>>
>> - Log -----------------------------------------------------------------
>> commit 9af8e5821984ac52d2622e421125bc3c3e63b2ec
>> Author: Stas Boukarev <stassats@gmail.com>
>> Date: Thu Jun 29 13:26:32 2023 +0300
>>
>> Don't unlink the combination fun in delete-block.
>>
>> Fails assertions in unlink-node. Have to disable *check-consistency*
>> to get SBCL to build without it.
>>
>> Fixes lp#2025306
>> ---
>> src/compiler/ir1util.lisp | 1 -
>> src/compiler/main.lisp | 2 +-
>> tests/compiler-2.pure.lisp | 13 +++++++++++++
>> 3 files changed, 14 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp
>> index 6a74c8dbd..a0c39ae1c 100644
>> --- a/src/compiler/ir1util.lisp
>> +++ b/src/compiler/ir1util.lisp
>> @@ -1676,7 +1676,6 @@
>> ;; combination.
>> (when (and (functional-letlike-p fun)
>> (eq (let-combination fun) node))
>> - (unlink-node (first (leaf-refs fun)))
>> (delete-lambda fun))))
>> (flush-dest (basic-combination-fun node))
>> (dolist (arg (basic-combination-args node))
>> diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
>> index 18aec336a..fa3e6b6bd 100644
>> --- a/src/compiler/main.lisp
>> +++ b/src/compiler/main.lisp
>> @@ -23,7 +23,7 @@
>> (defvar *entry-points-argument*)
>> (declaim (type list *entry-points-argument*))
>>
>> -(defvar *check-consistency* #-arm64 t #+arm64 nil)
>> +(defvar *check-consistency* nil)
>>
>> ;;; Set to NIL to disable loop analysis for register allocation.
>> (defvar *loop-analyze* t)
>> diff --git a/tests/compiler-2.pure.lisp b/tests/compiler-2.pure.lisp
>> index e6f49d831..39e46f26b 100644
>> --- a/tests/compiler-2.pure.lisp
>> +++ b/tests/compiler-2.pure.lisp
>> @@ -4089,3 +4089,16 @@
>> (((1+ most-positive-fixnum)) 3)
>> ((t) 2)))
>>
>> +(with-test (:name :unlink-node-in-delete-block)
>> + (checked-compile-and-assert
>> + ()
>> + `(lambda (b)
>> + (tagbody
>> + ((lambda (v6)
>> + ((lambda (a b &rest c)
>> + a b c
>> + (go 7))
>> + (catch 'ct8 0)
>> + (case b ((-424 -278) b) (t 0))))
>> + ((lambda () (go 7))))
>> + 7))))
>>
>> -----------------------------------------------------------------------
>>
>>
>> hooks/post-receive
>> --
>> SBCL
>>
>>
>> _______________________________________________
>> Sbcl-commits mailing list
>> Sbcl-commits@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/sbcl-commits
>>
> _______________________________________________
> Sbcl-devel mailing list
> Sbcl-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/sbcl-devel
>
[Attachment #5 (text/html)]
<div dir="ltr">debug-catch-tag? Probably just gotta ignore it.</div><div \
dir="ltr"></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On \
Thu, Jul 20, 2023 at 6:42 PM Douglas Katzman via Sbcl-devel <<a \
href="mailto:sbcl-devel@lists.sourceforge.net" \
target="_blank">sbcl-devel@lists.sourceforge.net</a>> wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr">Any idea why ppc64 would say this? \
(Built at the most recent change which fixes failure-to-build)<div><br><div>
<p style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-v \
ariant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:n \
ormal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures">::: UNEXPECTED-FAILURE \
:UNLINK-NODE-IN-DELETE-BLOCK due to SIMPLE-ERROR:</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>"Compilation of</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:norm \
al;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0);min-height:13px"><span \
style="font-variant-ligatures:no-common-ligatures"></span><br></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>(LAMBDA (B)</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>(TAGBODY</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>((LAMBDA (V6)</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>((LAMBDA (A B &REST C) A B C (GO 7)) (CATCH 'CT8 0)</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>(CASE B ((-424 -278) B) (T 0))))</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>((LAMBDA () (GO 7))))</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>7))</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:norm \
al;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0);min-height:13px"><span \
style="font-variant-ligatures:no-common-ligatures"></span><br></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>with</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:norm \
al;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0);min-height:13px"><span \
style="font-variant-ligatures:no-common-ligatures"></span><br></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>((SPEED 0) (SAFETY 0) (DEBUG 3) (COMPILATION-SPEED 1) (SPACE 1))</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:norm \
al;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0);min-height:13px"><span \
style="font-variant-ligatures:no-common-ligatures"></span><br></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>optimization policy signaled style-warning:</span></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:norm \
al;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0);min-height:13px"><span \
style="font-variant-ligatures:no-common-ligatures"></span><br></p> <p \
style="margin:0px;font-variant-numeric:normal;font-variant-east-asian:normal;font-vari \
ant-alternates:normal;font-kerning:auto;font-feature-settings:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:Menlo;color:rgb(0,0,0)"><span \
style="font-variant-ligatures:no-common-ligatures"><span> \
</span>SB-INT:SIMPLE-STYLE-WARNING: The variable V6 is defined but never \
used."</span></p></div></div></div><br><div class="gmail_quote"><div dir="ltr" \
class="gmail_attr">On Thu, Jun 29, 2023 at 6:28 AM stassats via Sbcl-commits <<a \
href="mailto:sbcl-commits@lists.sourceforge.net" \
target="_blank">sbcl-commits@lists.sourceforge.net</a>> \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch \
"master" has been updated in SBCL:<br> via \
9af8e5821984ac52d2622e421125bc3c3e63b2ec (commit)<br> from \
09e34ec745ae073d7ea178821d1a7a8f13c135df (commit)<br> <br>
- Log -----------------------------------------------------------------<br>
commit 9af8e5821984ac52d2622e421125bc3c3e63b2ec<br>
Author: Stas Boukarev <<a href="mailto:stassats@gmail.com" \
target="_blank">stassats@gmail.com</a>><br>
Date: Thu Jun 29 13:26:32 2023 +0300<br>
<br>
Don't unlink the combination fun in delete-block.<br>
<br>
Fails assertions in unlink-node. Have to disable *check-consistency*<br>
to get SBCL to build without it.<br>
<br>
Fixes lp#2025306<br>
---<br>
src/compiler/ir1util.lisp | 1 -<br>
src/compiler/main.lisp | 2 +-<br>
tests/compiler-2.pure.lisp | 13 +++++++++++++<br>
3 files changed, 14 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp<br>
index 6a74c8dbd..a0c39ae1c 100644<br>
--- a/src/compiler/ir1util.lisp<br>
+++ b/src/compiler/ir1util.lisp<br>
@@ -1676,7 +1676,6 @@<br>
;; combination.<br>
(when (and (functional-letlike-p fun)<br>
(eq (let-combination fun) node))<br>
- (unlink-node (first (leaf-refs fun)))<br>
(delete-lambda fun))))<br>
(flush-dest (basic-combination-fun node))<br>
(dolist (arg (basic-combination-args node))<br>
diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp<br>
index 18aec336a..fa3e6b6bd 100644<br>
--- a/src/compiler/main.lisp<br>
+++ b/src/compiler/main.lisp<br>
@@ -23,7 +23,7 @@<br>
(defvar *entry-points-argument*)<br>
(declaim (type list *entry-points-argument*))<br>
<br>
-(defvar *check-consistency* #-arm64 t #+arm64 nil)<br>
+(defvar *check-consistency* nil)<br>
<br>
;;; Set to NIL to disable loop analysis for register allocation.<br>
(defvar *loop-analyze* t)<br>
diff --git a/tests/compiler-2.pure.lisp b/tests/compiler-2.pure.lisp<br>
index e6f49d831..39e46f26b 100644<br>
--- a/tests/compiler-2.pure.lisp<br>
+++ b/tests/compiler-2.pure.lisp<br>
@@ -4089,3 +4089,16 @@<br>
(((1+ most-positive-fixnum)) 3)<br>
((t) 2)))<br>
<br>
+(with-test (:name :unlink-node-in-delete-block)<br>
+ (checked-compile-and-assert<br>
+ ()<br>
+ `(lambda (b)<br>
+ (tagbody<br>
+ ((lambda (v6)<br>
+ ((lambda (a b &rest c)<br>
+ a b c<br>
+ (go 7))<br>
+ (catch 'ct8 0)<br>
+ (case b ((-424 -278) b) (t 0))))<br>
+ ((lambda () (go 7))))<br>
+ 7))))<br>
<br>
-----------------------------------------------------------------------<br>
<br>
<br>
hooks/post-receive<br>
-- <br>
SBCL<br>
<br>
<br>
_______________________________________________<br>
Sbcl-commits mailing list<br>
<a href="mailto:Sbcl-commits@lists.sourceforge.net" \
target="_blank">Sbcl-commits@lists.sourceforge.net</a><br> <a \
href="https://lists.sourceforge.net/lists/listinfo/sbcl-commits" rel="noreferrer" \
target="_blank">https://lists.sourceforge.net/lists/listinfo/sbcl-commits</a><br> \
</blockquote></div> _______________________________________________<br>
Sbcl-devel mailing list<br>
<a href="mailto:Sbcl-devel@lists.sourceforge.net" \
target="_blank">Sbcl-devel@lists.sourceforge.net</a><br> <a \
href="https://lists.sourceforge.net/lists/listinfo/sbcl-devel" rel="noreferrer" \
target="_blank">https://lists.sourceforge.net/lists/listinfo/sbcl-devel</a><br> \
</blockquote></div>
_______________________________________________
Sbcl-devel mailing list
Sbcl-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic