Mercurial > hg > truffle
comparison src/share/vm/runtime/javaCalls.cpp @ 7771:f10843a2d961
Remove assumption that methods without bytecodes are empty.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Mon, 11 Feb 2013 17:20:51 +0100 |
parents | 291ffc492eb6 |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7758:859f7ec58a71 | 7771:f10843a2d961 |
---|---|
363 if (CheckJNICalls) { | 363 if (CheckJNICalls) { |
364 args->verify(method, result->get_type(), thread); | 364 args->verify(method, result->get_type(), thread); |
365 } | 365 } |
366 else debug_only(args->verify(method, result->get_type(), thread)); | 366 else debug_only(args->verify(method, result->get_type(), thread)); |
367 | 367 |
368 #ifndef GRAAL | |
368 // Ignore call if method is empty | 369 // Ignore call if method is empty |
369 if (method->is_empty_method()) { | 370 if (method->is_empty_method()) { |
370 assert(result->get_type() == T_VOID, "an empty method must return a void value"); | 371 assert(result->get_type() == T_VOID, "an empty method must return a void value"); |
371 return; | 372 return; |
372 } | 373 } |
373 | 374 #endif |
374 | 375 |
375 #ifdef ASSERT | 376 #ifdef ASSERT |
376 { InstanceKlass* holder = method->method_holder(); | 377 { InstanceKlass* holder = method->method_holder(); |
377 // A klass might not be initialized since JavaCall's might be used during the executing of | 378 // A klass might not be initialized since JavaCall's might be used during the executing of |
378 // the <clinit>. For example, a Thread.start might start executing on an object that is | 379 // the <clinit>. For example, a Thread.start might start executing on an object that is |