Mercurial > hg > graal-compiler

comparison src/share/vm/classfile/systemDictionary.hpp @ 8124:5fc51c1ecdeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents bab2a51f8dbe 8b46b0196eb0
children ec06c7e67698
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, 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.
165 /* It's NULL in non-1.4 JDKs. */ \ 165 /* It's NULL in non-1.4 JDKs. */ \
166 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ 166 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \
167 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ 167 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \
168 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 168 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \
169 do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ 169 do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \
170 \
171 do_klass(DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel ) \
172 \ 170 \
173 do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ 171 do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \
174 \ 172 \
175 /* Preload boxing klasses */ \ 173 /* Preload boxing klasses */ \
176 do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ 174 do_klass(Boolean_klass, java_lang_Boolean, Pre ) \
251 // Options after this point will use resolve_or_null instead. 249 // Options after this point will use resolve_or_null instead.
252 250
253 Opt, // preload tried; NULL if not present 251 Opt, // preload tried; NULL if not present
254 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection 252 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection
255 Opt_Only_JDK15, // preload tried; use only with JDK1.5+ 253 Opt_Only_JDK15, // preload tried; use only with JDK1.5+
256 Opt_Kernel, // preload tried only #ifdef KERNEL
257 OPTION_LIMIT, 254 OPTION_LIMIT,
258 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT) 255 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT)
259 }; 256 };
260 257
261 258
434 } 431 }
435 432
436 static Klass* check_klass_Pre( Klass* k) { return check_klass(k); } 433 static Klass* check_klass_Pre( Klass* k) { return check_klass(k); }
437 static Klass* check_klass_Pre_JSR292(Klass* k) { return EnableInvokeDynamic ? check_klass(k) : k; } 434 static Klass* check_klass_Pre_JSR292(Klass* k) { return EnableInvokeDynamic ? check_klass(k) : k; }
438 static Klass* check_klass_Opt( Klass* k) { return k; } 435 static Klass* check_klass_Opt( Klass* k) { return k; }
439 static Klass* check_klass_Opt_Kernel(Klass* k) { return k; } //== Opt
440 static Klass* check_klass_Opt_Only_JDK15(Klass* k) { 436 static Klass* check_klass_Opt_Only_JDK15(Klass* k) {
441 assert(JDK_Version::is_gte_jdk15x_version(), "JDK 1.5 only"); 437 assert(JDK_Version::is_gte_jdk15x_version(), "JDK 1.5 only");
442 return k; 438 return k;
443 } 439 }
444 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) { 440 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) {