projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed return value from descriptor_params_from_paramtypes.
[cacao.git]
/
src
/
vm
/
resolve.cpp
diff --git
a/src/vm/resolve.cpp
b/src/vm/resolve.cpp
index 80d8a4a11561bb371c8d4cf016a8f91d3a2224ab..a5345af71f926cc5c23baf8988fb12020a8e1166 100644
(file)
--- a/
src/vm/resolve.cpp
+++ b/
src/vm/resolve.cpp
@@
-1,6
+1,6
@@
/* src/vm/resolve.cpp - resolving classes/interfaces/fields/methods
/* src/vm/resolve.cpp - resolving classes/interfaces/fields/methods
- Copyright (C) 1996-20
05, 2006, 2007, 2008
+ Copyright (C) 1996-20
11
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
@@
-2068,8
+2068,7
@@
resolve_result_t resolve_method_lazy(methodinfo *refmethod,
/* have the method params already been parsed? no, do it. */
if (!mi->parseddesc->params)
/* 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 */
/* cache the result of the resolution */
@@
-2192,8
+2191,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)
/* 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 */
/* cache the resolution */
@@
-2653,8
+2651,7
@@
bool resolve_constrain_unresolved_field(unresolved_field *ref,
iptr.............the INVOKE* instruction
RETURN VALUE:
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
*******************************************************************************/
*******************************************************************************/
@@
-2679,9
+2676,9
@@
unresolved_method * resolve_create_unresolved_method(classinfo *referer,
/* allocate params if necessary */
if (!methodref->parseddesc.md->params)
/* 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);
/* create the data structure */
ref = NEW(unresolved_method);