X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fresolve.cpp;h=9d66442315e2a5a88e7bb2a355e429e6bd638a4c;hb=4e25f6be9878154a9a7ae28917ed34427cb8ca6a;hp=1d1173a87d4bca833f37cb6b09aa926f02ea596f;hpb=56fa24a4902f1e71f5d057487097f9438222f4b9;p=cacao.git

diff --git a/src/vm/resolve.cpp b/src/vm/resolve.cpp
index 1d1173a87..9d6644231 100644
--- a/src/vm/resolve.cpp
+++ b/src/vm/resolve.cpp
@@ -1,6 +1,6 @@
 /* src/vm/resolve.cpp - resolving classes/interfaces/fields/methods
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2011
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -29,22 +29,22 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "vm/access.h"
-#include "vm/classcache.h"
-#include "vm/descriptor.h"
+#include "vm/access.hpp"
+#include "vm/classcache.hpp"
+#include "vm/descriptor.hpp"
 #include "vm/exceptions.hpp"
 #include "vm/global.h"
 #include "vm/globals.hpp"
-#include "vm/linker.h"
+#include "vm/linker.hpp"
 #include "vm/loader.hpp"
 #include "vm/options.h"
 #include "vm/primitive.hpp"
 #include "vm/resolve.hpp"
 
 #include "vm/jit/jit.hpp"
-#include "vm/jit/verify/typeinfo.h"
+#include "vm/jit/verify/typeinfo.hpp"
 
 
 /******************************************************************************/
@@ -2067,9 +2067,7 @@ resolve_result_t resolve_method_lazy(methodinfo *refmethod,
 
 	/* have the method params already been parsed? no, do it. */
 
-	if (!mi->parseddesc->params)
-		if (!descriptor_params_from_paramtypes(mi->parseddesc, mi->flags))
-			return resolveFailed;
+	descriptor_params_from_paramtypes(mi->parseddesc, mi->flags);
 
 	/* cache the result of the resolution */
 
@@ -2191,9 +2189,7 @@ bool resolve_method(unresolved_method *ref, resolve_mode_t mode, methodinfo **re
 
 	/* have the method params already been parsed? no, do it. */
 
-	if (!mi->parseddesc->params)
-		if (!descriptor_params_from_paramtypes(mi->parseddesc, mi->flags))
-			return false;
+	descriptor_params_from_paramtypes(mi->parseddesc, mi->flags);
 
 	/* cache the resolution */
 
@@ -2653,8 +2649,7 @@ bool resolve_constrain_unresolved_field(unresolved_field *ref,
 	   iptr.............the INVOKE* instruction
 
    RETURN VALUE:
-       a pointer to a new unresolved_method struct, or
-	   NULL if an exception has been thrown
+       a pointer to a new unresolved_method struct
 
 *******************************************************************************/
 
@@ -2678,10 +2673,9 @@ unresolved_method * resolve_create_unresolved_method(classinfo *referer,
 #endif
 
 	/* allocate params if necessary */
-	if (!methodref->parseddesc.md->params)
-		if (!descriptor_params_from_paramtypes(methodref->parseddesc.md,
-					(invokestatic) ? ACC_STATIC : ACC_NONE))
-			return NULL;
+	descriptor_params_from_paramtypes(
+		methodref->parseddesc.md,
+		(invokestatic) ? ACC_STATIC : ACC_NONE);
 
 	/* create the data structure */
 	ref = NEW(unresolved_method);