提交 68123e81 编写于 作者: D dcubed

6949515: 3/3 VM crash when calling GetMethodDeclaringClass

Summary: Use resolve_external_guard() instead of resolve_non_null().
Reviewed-by: thurka, kamg, acorn
上级 45fe446b
/*
* Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1998-2010 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
......@@ -63,8 +63,14 @@ class JNIHandles : AllStatic {
// refers to NULL (as is the case for any weak reference).
static jmethodID make_jmethod_id(methodHandle mh);
static void destroy_jmethod_id(jmethodID mid);
// Use resolve_jmethod_id() in situations where the caller is expected
// to provide a valid jmethodID; the only sanity checks are in asserts;
// result guaranteed not to be NULL.
inline static methodOop resolve_jmethod_id(jmethodID mid);
inline static methodOop checked_resolve_jmethod_id(jmethodID mid); // NULL on invalid jmethodID
// Use checked_resolve_jmethod_id() in situations where the caller
// should provide a valid jmethodID, but might not. NULL is returned
// when the jmethodID does not refer to a valid method.
inline static methodOop checked_resolve_jmethod_id(jmethodID mid);
static void change_method_associated_with_jmethod_id(jmethodID jmid, methodHandle mh);
// Sentinel marking deleted handles in block. Note that we cannot store NULL as
......@@ -196,12 +202,8 @@ inline methodOop JNIHandles::resolve_jmethod_id(jmethodID mid) {
};
inline methodOop JNIHandles::checked_resolve_jmethod_id(jmethodID mid) {
if (mid == NULL) {
return (methodOop) NULL;
}
oop o = resolve_non_null((jobject) mid);
if (!o->is_method()) {
oop o = resolve_external_guard((jobject) mid);
if (o == NULL || !o->is_method()) {
return (methodOop) NULL;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册