Mercurial > hg > truffle
comparison src/share/vm/runtime/javaCalls.cpp @ 501:26bc4770e671
Merge
author | trims |
---|---|
date | Sat, 20 Dec 2008 09:58:36 -0800 |
parents | ad8c8ca4ab0f c6065343356f |
children | 0fbdb4381b99 |
comparison
equal
deleted
inserted
replaced
488:569b3b226089 | 501:26bc4770e671 |
---|---|
502 // If argument is oop | 502 // If argument is oop |
503 if (_is_oop[p]) { | 503 if (_is_oop[p]) { |
504 intptr_t v = _value[p]; | 504 intptr_t v = _value[p]; |
505 if (v != 0 ) { | 505 if (v != 0 ) { |
506 size_t t = (size_t)v; | 506 size_t t = (size_t)v; |
507 bad = (t < (size_t)os::vm_page_size() ) || !(*(oop*)v)->is_oop_or_null(true); | 507 bad = (t < (size_t)os::vm_page_size() ) || !Handle::raw_resolve((oop *)v)->is_oop_or_null(true); |
508 if (CheckJNICalls && bad) { | 508 if (CheckJNICalls && bad) { |
509 ReportJNIFatalError((JavaThread*)_thread, "Bad JNI oop argument"); | 509 ReportJNIFatalError((JavaThread*)_thread, "Bad JNI oop argument"); |
510 } | 510 } |
511 } | 511 } |
512 // for the regular debug case. | 512 // for the regular debug case. |