Mercurial > hg > truffle
diff src/share/vm/classfile/classLoader.cpp @ 4559:723df37192d6
Make it possible again to build a real client libjvm, drop the UseGraal flag.
Use the --vm option instead of a special -vm option in the bench command
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 10 Feb 2012 17:04:03 +0100 |
parents | 04b9a2566eec |
children | 532be189cf09 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoader.cpp Fri Feb 10 02:22:23 2012 +0100 +++ b/src/share/vm/classfile/classLoader.cpp Fri Feb 10 17:04:03 2012 +0100 @@ -184,7 +184,6 @@ ClassPathEntry::ClassPathEntry() { set_next(NULL); - _compiler_thread_only = false; } @@ -443,17 +442,23 @@ void ClassLoader::setup_bootstrap_search_path() { assert(_first_entry == NULL, "should not setup bootstrap class search path twice"); char* sys_class_path = os::strdup(Arguments::get_sysclasspath()); +#ifdef GRAAL char* compiler_class_path = os::strdup(Arguments::get_compilerclasspath()); +#endif if (TraceClassLoading && Verbose) { tty->print_cr("[Bootstrap loader class path=%s]", sys_class_path); +#ifdef GRAAL tty->print_cr("[Compiler loader class path=%s]", compiler_class_path); +#endif } - setup_bootstrap_search_path(sys_class_path, false); - setup_bootstrap_search_path(compiler_class_path, true); + setup_bootstrap_search_path(sys_class_path); +#ifdef GRAAL + setup_bootstrap_search_path(compiler_class_path); +#endif } -void ClassLoader::setup_bootstrap_search_path(char* sys_class_path, bool compiler_cp) { +void ClassLoader::setup_bootstrap_search_path(char* sys_class_path) { int len = (int)strlen(sys_class_path); int end = 0; @@ -465,7 +470,7 @@ char* path = NEW_C_HEAP_ARRAY(char, end-start+1); strncpy(path, &sys_class_path[start], end-start); path[end-start] = '\0'; - update_class_path_entry_list(path, false, compiler_cp); + update_class_path_entry_list(path, false); FREE_C_HEAP_ARRAY(char, path); while (sys_class_path[end] == os::path_separator()[0]) { end++; @@ -561,7 +566,7 @@ ClassPathEntry* e = _first_entry; while (e != NULL) { // assume zip entries have been canonicalized - if (e->compiler_thread_only() == entry->compiler_thread_only() && strcmp(entry->name(), e->name()) == 0) { + if (strcmp(entry->name(), e->name()) == 0) { return true; } e = e->next(); @@ -581,14 +586,12 @@ } void ClassLoader::update_class_path_entry_list(const char *path, - bool check_for_duplicates, - bool compiler_cp) { + bool check_for_duplicates) { struct stat st; if (os::stat((char *)path, &st) == 0) { // File or directory found ClassPathEntry* new_entry = NULL; create_class_path_entry((char *)path, st, &new_entry, LazyBootClassLoader); - //new_entry->set_compiler_thread_only(compiler_cp); // The kernel VM adds dynamically to the end of the classloader path and // doesn't reorder the bootclasspath which would break java.lang.Package // (see PackageInfo). @@ -905,9 +908,7 @@ PerfClassTraceTime::CLASS_LOAD); ClassPathEntry* e = _first_entry; while (e != NULL) { - if (THREAD->is_Compiler_thread() || !Universe::_fully_initialized || !e->compiler_thread_only()) { - stream = e->open_stream(name); - } + stream = e->open_stream(name); if (stream != NULL) { break; }