From: Julian Oppermann <julian.oppermann@student.kit.edu>
Date: Mon, 14 Mar 2011 14:56:00 +0000 (+0100)
Subject: Fix polymorphic entity lookup in case method entities are not duplicated in every... 
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=f3dd92c458aba50963d989b4988af122d456406e;p=libfirm

Fix polymorphic entity lookup in case method entities are not duplicated in every subclass.
---

diff --git a/ir/tr/tr_inheritance.c b/ir/tr/tr_inheritance.c
index 03bc472e6..f1c7d9c40 100644
--- a/ir/tr/tr_inheritance.c
+++ b/ir/tr/tr_inheritance.c
@@ -573,7 +573,12 @@ static ir_entity *do_resolve_ent_polymorphy(ir_type *dynamic_class, ir_entity *s
 {
 	size_t i, n_overwrittenby;
 
-	if (get_entity_owner(static_ent) == dynamic_class) return static_ent;
+	ir_type *owner = get_entity_owner(static_ent);
+	if (owner == dynamic_class) return static_ent;
+
+	// if the owner of the static_ent already is more special than the dynamic
+	// type to check against - stop here.
+	if (! is_SubClass_of(dynamic_class, owner)) return NULL;
 
 	n_overwrittenby = get_entity_n_overwrittenby(static_ent);
 	for (i = 0; i < n_overwrittenby; ++i) {
@@ -581,7 +586,9 @@ static ir_entity *do_resolve_ent_polymorphy(ir_type *dynamic_class, ir_entity *s
 		ent = do_resolve_ent_polymorphy(dynamic_class, ent);
 		if (ent) return ent;
 	}
-	return NULL;
+
+	// No further specialization of static_ent has been found
+	return static_ent;
 }
 
 /* Resolve polymorphy in the inheritance relation.