From 554be4c4de55e4c0fc31578fba88cdc35700a7cc Mon Sep 17 00:00:00 2001
From: edwin <none@none>
Date: Wed, 28 Jun 2006 21:44:16 +0000
Subject: [PATCH] * src/vm/linker.c (link_class_intern): Converted the check
 against creating a stubroutine twice into an assert. The check became
 obsolete because abstract methods do no longer get compiler stubs.

---
 src/vm/linker.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/vm/linker.c b/src/vm/linker.c
index d96bce9c0..d7413362f 100644
--- a/src/vm/linker.c
+++ b/src/vm/linker.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: linker.c 5056 2006-06-28 21:01:21Z edwin $
+   $Id: linker.c 5057 2006-06-28 21:44:16Z edwin $
 
 */
 
@@ -807,24 +807,21 @@ static classinfo *link_class_intern(classinfo *c)
 	for (i = 0; i < c->methodscount; i++) {
 		methodinfo *m = &(c->methods[i]);
 
+		assert(m->stubroutine == NULL);
+
 		if (m->flags & ACC_ABSTRACT)
 			continue;
 
-		/* Methods in ABSTRACT classes from interfaces maybe already
-		   have a stubroutine. */
-
-		if (m->stubroutine == NULL) {
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
-			if (opt_intrp)
-				m->stubroutine = intrp_createcompilerstub(m);
-			else
+		if (opt_intrp)
+			m->stubroutine = intrp_createcompilerstub(m);
+		else
 #endif
-				m->stubroutine = createcompilerstub(m);
+			m->stubroutine = createcompilerstub(m);
 #else
-			m->stubroutine = intrp_createcompilerstub(m);
+		m->stubroutine = intrp_createcompilerstub(m);
 #endif
-		}
 
 		if (!(m->flags & ACC_STATIC))
 			v->table[m->vftblindex] = (methodptr) (ptrint) m->stubroutine;
-- 
2.25.1