FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

defineclass.cc (handleMethodsEnd): Invoke verifier here...

Browse source 
* defineclass.cc (handleMethodsEnd): Invoke verifier here...
	(handleCodeAttribute): ... not here.
	* verify.cc (_Jv_BytecodeVerifier::state::state): Use `copy', not
	structure assignment.

From-SVN: r47591
This commit is contained in:
Tom Tromey 2001-12-04 06:37:53 +00:00 • committed by Tom Tromey
parent 2ca2d9ee0f
commit 64d3a1b48e
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libjava/defineclass.cc
View file

@ -500,10 +500,10 @@ void _Jv_ClassReader::read_methods ()
check_tag (name_index, JV_CONSTANT_Utf8);
prepare_pool_entry (descriptor_index, JV_CONSTANT_Utf8);
handleMethod (i, access_flags, name_index,
descriptor_index);
for (int j = 0; j < attributes_count; j++)
{
read_one_method_attribute (i);
@ -1282,10 +1282,6 @@ void _Jv_ClassReader::handleCodeAttribute
code_length);
def->interpreted_methods[method_index] = method;
// FIXME: Shouldn't this be done after loading completes?
// if (verify)
// _Jv_VerifyMethod (method);
}
void _Jv_ClassReader::handleExceptionTableEntry
@ -1332,9 +1328,17 @@ void _Jv_ClassReader::handleMethodsEnd ()
{
if (def->interpreted_methods[i] == 0)
throw_class_format_error ("method with no code");
if (verify)
{
_Jv_InterpMethod *m;
m = (reinterpret_cast<_Jv_InterpMethod *>
(def->interpreted_methods[i]));
// FIXME: enable once verifier is more fully tested.
// _Jv_VerifyMethod (m);
}
}
}
}
void _Jv_ClassReader::throw_class_format_error (char *msg)