diff options
| author | Valery Ushakov <uwe@stderr.spb.ru> | 2019-03-10 03:44:16 +0200 |
|---|---|---|
| committer | Valery Ushakov <uwe@stderr.spb.ru> | 2019-03-10 03:44:16 +0200 |
| commit | 594bd56378a3a707845dd8813881c427a3a8d16e (patch) | |
| tree | 5f18116b77d615f40c50d449a332dafd21347c05 /limbo/types.c | |
| parent | 9b7850d511c2c910abfb42ece20650b97fba5a72 (diff) | |
| parent | 55520626f59983d296c98c008af92f7c5c27bf5f (diff) | |
Merged default into NetBSD/pthreads
Diffstat (limited to 'limbo/types.c')
| -rw-r--r-- | limbo/types.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/limbo/types.c b/limbo/types.c index 6d231115..c8105d5a 100644 --- a/limbo/types.c +++ b/limbo/types.c @@ -2024,7 +2024,7 @@ cycfield(Type *base, Decl *id) id->sym->name, base); id->cycerr = 1; }else if(arc & ArcCyc){ - if((arc & ArcArray) && id->cyc == 0 && !(arc & ArcPolycyc)){ + if((arc & ArcArray) && oldcycles && id->cyc == 0 && !(arc & ArcPolycyc)){ if(id->cycerr == 0) error(base->src.start, "illegal circular reference to type %T in field %s of %t", id->ty, id->sym->name, base); @@ -3466,7 +3466,7 @@ expandtype(Type *t, Type *instt, Decl *adtt, Tpair **tp) if(t == nil) return nil; -if(debug['w']) print("expandtype %d %lux %T\n", t->kind, (ulong)t, t); +if(debug['w']) print("expandtype %d %#p %T\n", t->kind, t, t); if(!toccurs(t, tp)) return t; if(debug['w']) print("\texpanding\n"); |