Mercurial > hg > graal-compiler

comparison src/share/vm/classfile/dictionary.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6 78bbf4d43a14
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 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.
28 #include "memory/iterator.hpp" 28 #include "memory/iterator.hpp"
29 #include "oops/oop.inline.hpp" 29 #include "oops/oop.inline.hpp"
30 #include "prims/jvmtiRedefineClassesTrace.hpp" 30 #include "prims/jvmtiRedefineClassesTrace.hpp"
31 #include "utilities/hashtable.inline.hpp" 31 #include "utilities/hashtable.inline.hpp"
32 32
33 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
33 34
34 DictionaryEntry* Dictionary::_current_class_entry = NULL; 35 DictionaryEntry* Dictionary::_current_class_entry = NULL;
35 int Dictionary::_current_class_index = 0; 36 int Dictionary::_current_class_index = 0;
36 37
37 38
705 // boostrap loader 706 // boostrap loader
706 guarantee(loader_data != NULL || DumpSharedSpaces || 707 guarantee(loader_data != NULL || DumpSharedSpaces ||
707 loader_data->class_loader() == NULL || 708 loader_data->class_loader() == NULL ||
708 loader_data->class_loader()->is_instance(), 709 loader_data->class_loader()->is_instance(),
709 "checking type of class_loader"); 710 "checking type of class_loader");
710 e->verify(/*check_dictionary*/false); 711 e->verify();
711 probe->verify_protection_domain_set(); 712 probe->verify_protection_domain_set();
712 element_count++; 713 element_count++;
713 } 714 }
714 } 715 }
715 guarantee(number_of_entries() == element_count, 716 guarantee(number_of_entries() == element_count,