1.1 --- a/src/share/vm/runtime/reflection.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/reflection.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, 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 @@ -45,11 +45,11 @@
1.11 class Reflection: public AllStatic {
1.12 private:
1.13 // Access checking
1.14 - static bool reflect_check_access(klassOop field_class, AccessFlags acc, klassOop target_class, bool is_method_invoke, TRAPS);
1.15 + static bool reflect_check_access(Klass* field_class, AccessFlags acc, Klass* target_class, bool is_method_invoke, TRAPS);
1.16
1.17 // Conversion
1.18 - static klassOop basic_type_mirror_to_arrayklass(oop basic_type_mirror, TRAPS);
1.19 - static oop basic_type_arrayklass_to_mirror(klassOop basic_type_arrayklass, TRAPS);
1.20 + static Klass* basic_type_mirror_to_arrayklass(oop basic_type_mirror, TRAPS);
1.21 + static oop basic_type_arrayklass_to_mirror(Klass* basic_type_arrayklass, TRAPS);
1.22
1.23 static objArrayHandle get_parameter_types(methodHandle method, int parameter_count, oop* return_type, TRAPS);
1.24 static objArrayHandle get_exception_types(methodHandle method, TRAPS);
1.25 @@ -86,19 +86,19 @@
1.26 static arrayOop reflect_new_multi_array(oop element_mirror, typeArrayOop dimensions, TRAPS);
1.27
1.28 // Verification
1.29 - static bool verify_class_access(klassOop current_class, klassOop new_class, bool classloader_only);
1.30 + static bool verify_class_access(Klass* current_class, Klass* new_class, bool classloader_only);
1.31
1.32 - static bool verify_field_access(klassOop current_class,
1.33 - klassOop resolved_class,
1.34 - klassOop field_class,
1.35 + static bool verify_field_access(Klass* current_class,
1.36 + Klass* resolved_class,
1.37 + Klass* field_class,
1.38 AccessFlags access,
1.39 bool classloader_only,
1.40 bool protected_restriction = false);
1.41 - static bool is_same_class_package(klassOop class1, klassOop class2);
1.42 - static bool is_same_package_member(klassOop class1, klassOop class2, TRAPS);
1.43 + static bool is_same_class_package(Klass* class1, Klass* class2);
1.44 + static bool is_same_package_member(Klass* class1, Klass* class2, TRAPS);
1.45
1.46 static bool can_relax_access_check_for(
1.47 - klassOop accessor, klassOop accesee, bool classloader_only);
1.48 + Klass* accessor, Klass* accesee, bool classloader_only);
1.49
1.50 // inner class reflection
1.51 // raise an ICCE unless the required relationship can be proven to hold
