1.1 --- a/src/share/vm/prims/jvmtiEnter.xsl Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/prims/jvmtiEnter.xsl Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,6 +1,6 @@ 1.4 <?xml version="1.0"?> 1.5 <!-- 1.6 - Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 + Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. 1.8 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 1.10 This code is free software; you can redistribute it and/or modify it 1.11 @@ -880,12 +880,12 @@ 1.12 </xsl:apply-templates> 1.13 <xsl:text> 1.14 } 1.15 - klassOop k_oop = java_lang_Class::as_klassOop(k_mirror); 1.16 + Klass* k_oop = java_lang_Class::as_Klass(k_mirror); 1.17 if (k_oop == NULL) { 1.18 </xsl:text> 1.19 <xsl:apply-templates select=".." mode="traceError"> 1.20 <xsl:with-param name="err">JVMTI_ERROR_INVALID_CLASS</xsl:with-param> 1.21 - <xsl:with-param name="comment"> - no klassOop - jclass = 0x%x</xsl:with-param> 1.22 + <xsl:with-param name="comment"> - no Klass* - jclass = 0x%x</xsl:with-param> 1.23 <xsl:with-param name="extraValue">, <xsl:value-of select="$name"/></xsl:with-param> 1.24 </xsl:apply-templates> 1.25 <xsl:text> 1.26 @@ -898,7 +898,7 @@ 1.27 1.28 <xsl:template match="jmethodID" mode="dochecks"> 1.29 <xsl:param name="name"/> 1.30 - <xsl:text> methodOop method_oop = JNIHandles::checked_resolve_jmethod_id(</xsl:text> 1.31 + <xsl:text> Method* method_oop = Method::checked_resolve_jmethod_id(</xsl:text> 1.32 <xsl:value-of select="$name"/> 1.33 <xsl:text>);
</xsl:text> 1.34 <xsl:text> if (method_oop == NULL) {
</xsl:text>