Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/jvmtiEnv.xsl @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | da91efe96a93 |
children |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 <?xml version="1.0"?> | 1 <?xml version="1.0"?> |
2 <!-- | 2 <!-- |
3 Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. | 3 Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. |
4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5 | 5 |
6 This code is free software; you can redistribute it and/or modify it | 6 This code is free software; you can redistribute it and/or modify it |
7 under the terms of the GNU General Public License version 2 only, as | 7 under the terms of the GNU General Public License version 2 only, as |
8 published by the Free Software Foundation. | 8 published by the Free Software Foundation. |
72 <xsl:text> | 72 <xsl:text> |
73 if (java_lang_Class::is_primitive(k_mirror)) { | 73 if (java_lang_Class::is_primitive(k_mirror)) { |
74 // DO PRIMITIVE CLASS PROCESSING | 74 // DO PRIMITIVE CLASS PROCESSING |
75 return JVMTI_ERROR_MUST_POSSESS_CAPABILITY; | 75 return JVMTI_ERROR_MUST_POSSESS_CAPABILITY; |
76 } | 76 } |
77 klassOop k_oop = java_lang_Class::as_klassOop(k_mirror); | 77 Klass* k_oop = java_lang_Class::as_Klass(k_mirror); |
78 if (k_oop == NULL) { | 78 if (k_oop == NULL) { |
79 return JVMTI_ERROR_INVALID_CLASS; | 79 return JVMTI_ERROR_INVALID_CLASS; |
80 }</xsl:text> | 80 }</xsl:text> |
81 </xsl:if> | 81 </xsl:if> |
82 </xsl:for-each> | 82 </xsl:for-each> |