From cadf8c3cb000fd2c322f89689229dc94d7deddf4 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sun, 13 Jul 2014 02:04:27 -0500 Subject: [PATCH] Revert "Library defs don't bind to each other; fix #479" This reverts commit 6b6e3f42627f360cbbad2287968b2a209ab43593. It was the wrong fix. --- compile.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/compile.c b/compile.c index dc0c009..64ff41d 100644 --- a/compile.c +++ b/compile.c @@ -290,30 +290,16 @@ block block_bind(block binder, block body, int bindflags) { block block_bind_referenced(block binder, block body, int bindflags) { assert(block_has_only_binders(binder, bindflags)); bindflags |= OP_HAS_BINDING; - - // Repeatedly bind until there's no remaining references to any of the - // binders in binder. - block unrefd = gen_noop(); - int unref_count = 0, last = -1; -loop: + block refd = gen_noop(); for (inst* curr; (curr = block_take(&binder));) { block b = inst_block(curr); if (block_bind_subblock(b, body, bindflags)) { - body = BLOCK(b, body); + refd = BLOCK(refd, b); } else { - unrefd = BLOCK(unrefd, b); - unref_count++; + block_free(b); } } - if (unref_count == 0 || unref_count == last) { - block_free(unrefd); - return body; - } - last = unref_count; - unref_count = 0; - binder = unrefd; - unrefd = gen_noop(); - goto loop; + return block_join(refd, body); } block gen_function(const char* name, block formals, block body) { -- 2.40.0