Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/jvm_misc.hpp @ 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 | 675ffabf3798 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
31 // Useful entry points shared by JNI and JVM interface. | 31 // Useful entry points shared by JNI and JVM interface. |
32 // We do not allow real JNI or JVM entry point to call each other. | 32 // We do not allow real JNI or JVM entry point to call each other. |
33 | 33 |
34 jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS); | 34 jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS); |
35 | 35 |
36 void trace_class_resolution(klassOop to_class); | 36 void trace_class_resolution(Klass* to_class); |
37 | 37 |
38 /* | 38 /* |
39 * Support for Serialization and RMI. Currently used by HotSpot only. | 39 * Support for Serialization and RMI. Currently used by HotSpot only. |
40 */ | 40 */ |
41 | 41 |