1.1 --- a/src/share/vm/classfile/javaClasses.hpp Fri Mar 11 22:33:47 2011 -0800
1.2 +++ b/src/share/vm/classfile/javaClasses.hpp Fri Mar 11 22:34:57 2011 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -794,11 +794,11 @@
1.11 };
1.12
1.13
1.14 -// Interface to java.dyn.MethodHandle objects
1.15 +// Interface to java.lang.invoke.MethodHandle objects
1.16
1.17 class MethodHandleEntry;
1.18
1.19 -class java_dyn_MethodHandle: AllStatic {
1.20 +class java_lang_invoke_MethodHandle: AllStatic {
1.21 friend class JavaClasses;
1.22
1.23 private:
1.24 @@ -839,7 +839,7 @@
1.25 static int vmslots_offset_in_bytes() { return _vmslots_offset; }
1.26 };
1.27
1.28 -class sun_dyn_DirectMethodHandle: public java_dyn_MethodHandle {
1.29 +class java_lang_invoke_DirectMethodHandle: public java_lang_invoke_MethodHandle {
1.30 friend class JavaClasses;
1.31
1.32 private:
1.33 @@ -864,7 +864,7 @@
1.34 static int vmindex_offset_in_bytes() { return _vmindex_offset; }
1.35 };
1.36
1.37 -class sun_dyn_BoundMethodHandle: public java_dyn_MethodHandle {
1.38 +class java_lang_invoke_BoundMethodHandle: public java_lang_invoke_MethodHandle {
1.39 friend class JavaClasses;
1.40
1.41 private:
1.42 @@ -891,7 +891,7 @@
1.43 static int vmargslot_offset_in_bytes() { return _vmargslot_offset; }
1.44 };
1.45
1.46 -class sun_dyn_AdapterMethodHandle: public sun_dyn_BoundMethodHandle {
1.47 +class java_lang_invoke_AdapterMethodHandle: public java_lang_invoke_BoundMethodHandle {
1.48 friend class JavaClasses;
1.49
1.50 private:
1.51 @@ -942,14 +942,14 @@
1.52 };
1.53
1.54
1.55 -// Interface to sun.dyn.MemberName objects
1.56 +// Interface to java.lang.invoke.MemberName objects
1.57 // (These are a private interface for Java code to query the class hierarchy.)
1.58
1.59 -class sun_dyn_MemberName: AllStatic {
1.60 +class java_lang_invoke_MemberName: AllStatic {
1.61 friend class JavaClasses;
1.62
1.63 private:
1.64 - // From java.dyn.MemberName:
1.65 + // From java.lang.invoke.MemberName:
1.66 // private Class<?> clazz; // class in which the method is defined
1.67 // private String name; // may be null if not yet materialized
1.68 // private Object type; // may be null if not yet materialized
1.69 @@ -1018,9 +1018,9 @@
1.70 };
1.71
1.72
1.73 -// Interface to java.dyn.MethodType objects
1.74 +// Interface to java.lang.invoke.MethodType objects
1.75
1.76 -class java_dyn_MethodType: AllStatic {
1.77 +class java_lang_invoke_MethodType: AllStatic {
1.78 friend class JavaClasses;
1.79
1.80 private:
1.81 @@ -1052,7 +1052,7 @@
1.82 static int form_offset_in_bytes() { return _form_offset; }
1.83 };
1.84
1.85 -class java_dyn_MethodTypeForm: AllStatic {
1.86 +class java_lang_invoke_MethodTypeForm: AllStatic {
1.87 friend class JavaClasses;
1.88
1.89 private:
1.90 @@ -1075,9 +1075,9 @@
1.91 };
1.92
1.93
1.94 -// Interface to java.dyn.CallSite objects
1.95 +// Interface to java.lang.invoke.CallSite objects
1.96
1.97 -class java_dyn_CallSite: AllStatic {
1.98 +class java_lang_invoke_CallSite: AllStatic {
1.99 friend class JavaClasses;
1.100
1.101 private:
