From f7ba514a709cada4a1cc8d4c2799ba55d7c1daa5 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 13 Jan 2022 20:19:16 -0800 Subject: [PATCH] stack-checker.dependencies: use existing add-depends-on-c-type --- .../tree/propagation/transforms/transforms.factor | 2 +- basis/stack-checker/dependencies/dependencies.factor | 9 --------- basis/stack-checker/transforms/transforms.factor | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/basis/compiler/tree/propagation/transforms/transforms.factor b/basis/compiler/tree/propagation/transforms/transforms.factor index 6790139d0a..04653a8280 100644 --- a/basis/compiler/tree/propagation/transforms/transforms.factor +++ b/basis/compiler/tree/propagation/transforms/transforms.factor @@ -186,7 +186,7 @@ ERROR: bad-partial-eval quot word ; : inline-new ( class -- quot/f ) { { [ dup struct-class? ] [ - dup dup struct-slots add-depends-on-struct-slots + dup add-depends-on-c-type '[ _ ] ] } { [ dup tuple-class? ] [ dup tuple-layout diff --git a/basis/stack-checker/dependencies/dependencies.factor b/basis/stack-checker/dependencies/dependencies.factor index 649d2fd95b..4b29f2c98e 100644 --- a/basis/stack-checker/dependencies/dependencies.factor +++ b/basis/stack-checker/dependencies/dependencies.factor @@ -128,15 +128,6 @@ TUPLE: depends-on-tuple-layout class layout ; M: depends-on-tuple-layout satisfied? [ class>> tuple-layout ] [ layout>> ] bi eq? ; -TUPLE: depends-on-struct-slots class slots ; - -: add-depends-on-struct-slots ( class slots -- ) - [ drop +conditional+ depends-on ] - [ depends-on-struct-slots add-conditional-dependency ] 2bi ; - -M: depends-on-struct-slots satisfied? - [ class>> struct-slots ] [ slots>> ] bi eq? ; - TUPLE: depends-on-flushable word ; : add-depends-on-flushable ( word -- ) diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor index 5f0f48a476..37789b7861 100644 --- a/basis/stack-checker/transforms/transforms.factor +++ b/basis/stack-checker/transforms/transforms.factor @@ -142,7 +142,7 @@ IN: stack-checker.transforms \ boa [ { { [ dup struct-class? ] [ - dup dup struct-slots add-depends-on-struct-slots + dup add-depends-on-c-type '[ _ ] ] } { [ dup tuple-class? ] [ dup tuple-layout -- 2.34.1