Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/systemDictionary.hpp @ 22298:c28cb37b2e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents 0e095e2c24e2
children 7b4a47fcc4c0
comparison
equal deleted inserted replaced
22297:571202729bbf 22298:c28cb37b2e1d
266 WK_KLASSES_DO(WK_KLASS_ENUM) 266 WK_KLASSES_DO(WK_KLASS_ENUM)
267 #undef WK_KLASS_ENUM 267 #undef WK_KLASS_ENUM
268 268
269 WKID_LIMIT, 269 WKID_LIMIT,
270 270
271 #ifdef JVMCI 271 #if INCLUDE_JVMCI
272 FIRST_JVMCI_WKID = WK_KLASS_ENUM_NAME(Debug_klass), 272 FIRST_JVMCI_WKID = WK_KLASS_ENUM_NAME(Debug_klass),
273 LAST_JVMCI_WKID = WK_KLASS_ENUM_NAME(AbstractValue_klass), 273 LAST_JVMCI_WKID = WK_KLASS_ENUM_NAME(AbstractValue_klass),
274 #endif 274 #endif
275 275
276 FIRST_WKID = NO_WKID + 1 276 FIRST_WKID = NO_WKID + 1
284 // Options after this point will use resolve_or_null instead. 284 // Options after this point will use resolve_or_null instead.
285 285
286 Opt, // preload tried; NULL if not present 286 Opt, // preload tried; NULL if not present
287 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection 287 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection
288 Opt_Only_JDK15, // preload tried; use only with JDK1.5+ 288 Opt_Only_JDK15, // preload tried; use only with JDK1.5+
289 #ifdef JVMCI 289 #if INCLUDE_JVMCI
290 Jvmci, // preload tried; error if not present, use only with JVMCI 290 Jvmci, // preload tried; error if not present, use only with JVMCI
291 #endif 291 #endif
292 OPTION_LIMIT, 292 OPTION_LIMIT,
293 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT) 293 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT)
294 }; 294 };
476 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) { 476 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) {
477 assert(JDK_Version::is_gte_jdk14x_version() && UseNewReflection, "JDK 1.4 only"); 477 assert(JDK_Version::is_gte_jdk14x_version() && UseNewReflection, "JDK 1.4 only");
478 // despite the optional loading, if you use this it must be present: 478 // despite the optional loading, if you use this it must be present:
479 return check_klass(k); 479 return check_klass(k);
480 } 480 }
481 #ifdef JVMCI 481 #if INCLUDE_JVMCI
482 static Klass* check_klass_Jvmci(Klass* k) { return k; } 482 static Klass* check_klass_Jvmci(Klass* k) { return k; }
483 #endif 483 #endif
484 484
485 static bool initialize_wk_klass(WKID id, int init_opt, TRAPS); 485 static bool initialize_wk_klass(WKID id, int init_opt, TRAPS);
486 static void initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS); 486 static void initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS);
544 static bool ClassLoader_klass_loaded() { return WK_KLASS(ClassLoader_klass) != NULL; } 544 static bool ClassLoader_klass_loaded() { return WK_KLASS(ClassLoader_klass) != NULL; }
545 545
546 // Returns default system loader 546 // Returns default system loader
547 static oop java_system_loader(); 547 static oop java_system_loader();
548 548
549 #ifdef JVMCI 549 #if INCLUDE_JVMCI
550 // Returns the JVMCI loader. This will be NULL if !UseJVMCIClassLoader 550 // Returns the JVMCI loader. This will be NULL if !UseJVMCIClassLoader
551 // in which case it's equivalent to the boot loader 551 // in which case it's equivalent to the boot loader
552 static oop jvmci_loader(); 552 static oop jvmci_loader();
553 // Sets the JVMCI loader. This is called at most once. 553 // Sets the JVMCI loader. This is called at most once.
554 static void init_jvmci_loader(oop loader); 554 static void init_jvmci_loader(oop loader);
782 782
783 // table of box klasses (int_klass, etc.) 783 // table of box klasses (int_klass, etc.)
784 static Klass* _box_klasses[T_VOID+1]; 784 static Klass* _box_klasses[T_VOID+1];
785 785
786 static oop _java_system_loader; 786 static oop _java_system_loader;
787 #ifdef JVMCI 787 #if INCLUDE_JVMCI
788 static oop _jvmci_loader; 788 static oop _jvmci_loader;
789 #endif 789 #endif
790 790
791 static bool _has_loadClassInternal; 791 static bool _has_loadClassInternal;
792 static bool _has_checkPackageAccess; 792 static bool _has_checkPackageAccess;