X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeuses.c;h=f79400fd56574b20b0547476145aa65f10ae042d;hb=557b24d620738753fda7d0137575f4d12a996b36;hp=3cf8cd89b2acfb72b693968c6492ac7552dcbae7;hpb=6faa3955a87b6ac0f872c77431ceef8a6c4c4ac8;p=libfirm diff --git a/ir/be/beuses.c b/ir/be/beuses.c index 3cf8cd89b..f79400fd5 100644 --- a/ir/be/beuses.c +++ b/ir/be/beuses.c @@ -39,7 +39,6 @@ typedef struct _be_use_t { const ir_node *bl; const ir_node *irn; unsigned next_use; - int is_set; } be_use_t; struct _be_uses_t { @@ -67,16 +66,18 @@ static int cmp_use(const void *a, const void *b, size_t n) } static INLINE be_use_t *get_or_set_use(be_uses_t *uses, - const ir_node *bl, const ir_node *irn, unsigned next_use) + const ir_node *bl, const ir_node *def, unsigned next_use) { - unsigned hash = HASH_COMBINE(HASH_PTR(bl), HASH_PTR(irn)); + unsigned hash = HASH_COMBINE(HASH_PTR(bl), HASH_PTR(def)); be_use_t templ; + be_use_t* result; templ.bl = bl; - templ.irn = irn; - templ.next_use = next_use; - templ.is_set = 0; - return set_insert(uses->uses, &templ, sizeof(templ), hash); + templ.irn = def; + templ.next_use = be_get_next_use(uses, sched_first(bl), 0, def, 0); + result = set_insert(uses->uses, &templ, sizeof(templ), hash); + + return result; } unsigned be_get_next_use(be_uses_t *uses, const ir_node *from, @@ -85,14 +86,8 @@ unsigned be_get_next_use(be_uses_t *uses, const ir_node *from, static unsigned get_next_use_bl(be_uses_t *uses, const ir_node *bl, const ir_node *def) { - be_use_t *u; - - u = get_or_set_use(uses, bl, def, 0); - if (! u->is_set) { - u->is_set = 1; - u->next_use = USES_INFINITY; - u->next_use = be_get_next_use(uses, sched_first(bl), 0, def, 0); - } + be_use_t *u = get_or_set_use(uses, bl, def, 0); + return u->next_use; }