Mercurial > hg > graal-compiler

comparison src/share/vm/classfile/systemDictionary.hpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 9ba90252ce08 90273fc0a981
children 989155e2d07a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
509 509
510 // Compute the default system loader 510 // Compute the default system loader
511 static void compute_java_system_loader(TRAPS); 511 static void compute_java_system_loader(TRAPS);
512 512
513 // Register a new class loader 513 // Register a new class loader
514 static ClassLoaderData* register_loader(Handle class_loader); 514 static ClassLoaderData* register_loader(Handle class_loader, TRAPS);
515 private: 515 private:
516 // Mirrors for primitive classes (created eagerly) 516 // Mirrors for primitive classes (created eagerly)
517 static oop check_mirror(oop m) { 517 static oop check_mirror(oop m) {
518 assert(m != NULL, "mirror not initialized"); 518 assert(m != NULL, "mirror not initialized");
519 return m; 519 return m;
569 static const char* loader_name(oop loader) { 569 static const char* loader_name(oop loader) {
570 return ((loader) == NULL ? "<bootloader>" : 570 return ((loader) == NULL ? "<bootloader>" :
571 InstanceKlass::cast((loader)->klass())->name()->as_C_string() ); 571 InstanceKlass::cast((loader)->klass())->name()->as_C_string() );
572 } 572 }
573 static const char* loader_name(ClassLoaderData* loader_data) { 573 static const char* loader_name(ClassLoaderData* loader_data) {
574 return (loader_data->is_the_null_class_loader_data() ? "<bootloader>" : 574 return (loader_data->class_loader() == NULL ? "<bootloader>" :
575 InstanceKlass::cast((loader_data->class_loader())->klass())->name()->as_C_string() ); 575 InstanceKlass::cast((loader_data->class_loader())->klass())->name()->as_C_string() );
576 } 576 }
577 577
578 // Record the error when the first attempt to resolve a reference from a constant 578 // Record the error when the first attempt to resolve a reference from a constant
579 // pool entry to a class fails. 579 // pool entry to a class fails.