comparison src/share/vm/classfile/systemDictionary.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 9a804ec7f707 9428a0b94204
children c2270ad35f57
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
446 446
447 #ifdef ASSERT 447 #ifdef ASSERT
448 static bool is_internal_format(Symbol* class_name); 448 static bool is_internal_format(Symbol* class_name);
449 #endif 449 #endif
450 450
451 // Verify class is in dictionary
452 static void verify_obj_klass_present(Symbol* class_name,
453 ClassLoaderData* loader_data);
454
455 // Initialization 451 // Initialization
456 static void initialize(TRAPS); 452 static void initialize(TRAPS);
457 453
458 // Fast access to commonly used classes (preloaded) 454 // Fast access to commonly used classes (preloaded)
459 static Klass* check_klass(Klass* k) { 455 static Klass* check_klass(Klass* k) {
701 instanceKlassHandle k, TRAPS); 697 instanceKlassHandle k, TRAPS);
702 static instanceKlassHandle load_shared_class(Symbol* class_name, 698 static instanceKlassHandle load_shared_class(Symbol* class_name,
703 Handle class_loader, TRAPS); 699 Handle class_loader, TRAPS);
704 static instanceKlassHandle load_shared_class(instanceKlassHandle ik, 700 static instanceKlassHandle load_shared_class(instanceKlassHandle ik,
705 Handle class_loader, TRAPS); 701 Handle class_loader, TRAPS);
706 static void clean_up_shared_class(instanceKlassHandle ik, Handle class_loader, TRAPS);
707 static instanceKlassHandle load_instance_class(Symbol* class_name, Handle class_loader, TRAPS); 702 static instanceKlassHandle load_instance_class(Symbol* class_name, Handle class_loader, TRAPS);
708 static Handle compute_loader_lock_object(Handle class_loader, TRAPS); 703 static Handle compute_loader_lock_object(Handle class_loader, TRAPS);
709 static void check_loader_lock_contention(Handle loader_lock, TRAPS); 704 static void check_loader_lock_contention(Handle loader_lock, TRAPS);
710 static bool is_parallelCapable(Handle class_loader); 705 static bool is_parallelCapable(Handle class_loader);
711 static bool is_parallelDefine(Handle class_loader); 706 static bool is_parallelDefine(Handle class_loader);