From f55d473b7373a47721a2200ae73b9fbe7fb7b32e Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 13 Mar 2008 16:43:54 +0000 Subject: * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Check loading constraints. (_Jv_CheckOrCreateLoadingConstraint): New function. * java/lang/ClassLoader.java (loadingConstraints): New field. * link.cc (_Jv_Linker::find_field): Use _Jv_CheckOrCreateLoadingConstraint. (_Jv_Linker::check_loading_constraints): New function. (_Jv_Linker::resolve_method_entry): Use check_loading_constraints. (_Jv_Linker::append_partial_itable): Likewise. (_Jv_Linker::layout_vtable_methods): Likewise. * include/jvm.h (_Jv_Linker::check_loading_constraints): Declare. (_Jv_CheckOrCreateLoadingConstraint): Declare. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@133172 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/ClassLoader.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libjava/java/lang/ClassLoader.h') diff --git a/libjava/java/lang/ClassLoader.h b/libjava/java/lang/ClassLoader.h index ed6f5449adc..5112eab983e 100644 --- a/libjava/java/lang/ClassLoader.h +++ b/libjava/java/lang/ClassLoader.h @@ -86,6 +86,7 @@ private: void checkInitialized(); public: // actually package-private ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loadedClasses; + ::java::util::HashMap * loadingConstraints; ::java::util::HashMap * definedPackages; private: ::java::lang::ClassLoader * parent; -- cgit v1.2.3