• file
• revisions
• annotate
• diff
• comparison
• raw

src/share/vm/classfile/classLoaderData.inline.hpp@78bbf4d43a14 (annotated)

src/share/vm/classfile/classLoaderData.inline.hpp

Thu, 22 May 2014 15:52:41 -0400

author

drchase

date

Thu, 22 May 2014 15:52:41 -0400

changeset 6680

78bbf4d43a14

parent 6198

55fb97c4c58d

child 6876

710a3c8b516e

child 8444

9f2a972df4da

permissions

-rw-r--r--

8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti

coleenp@4037	1	/*
mikael@6198	2	* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
coleenp@4037	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
coleenp@4037	4	*
coleenp@4037	5	* This code is free software; you can redistribute it and/or modify it
coleenp@4037	6	* under the terms of the GNU General Public License version 2 only, as
coleenp@4037	7	* published by the Free Software Foundation.
coleenp@4037	8	*
coleenp@4037	9	* This code is distributed in the hope that it will be useful, but WITHOUT
coleenp@4037	10	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
coleenp@4037	11	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
coleenp@4037	12	* version 2 for more details (a copy is included in the LICENSE file that
coleenp@4037	13	* accompanied this code).
coleenp@4037	14	*
coleenp@4037	15	* You should have received a copy of the GNU General Public License version
coleenp@4037	16	* 2 along with this work; if not, write to the Free Software Foundation,
coleenp@4037	17	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
coleenp@4037	18	*
coleenp@4037	19	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
coleenp@4037	20	* or visit www.oracle.com if you need additional information or have any
coleenp@4037	21	* questions.
coleenp@4037	22	*
coleenp@4037	23	*/
coleenp@4037	24
coleenp@4037	25	#include "classfile/classLoaderData.hpp"
coleenp@4037	26	#include "classfile/javaClasses.hpp"
coleenp@4037	27
stefank@4667	28	inline ClassLoaderData* ClassLoaderData::class_loader_data_or_null(oop loader) {
stefank@4667	29	if (loader == NULL) {
stefank@4667	30	return ClassLoaderData::the_null_class_loader_data();
stefank@4667	31	}
stefank@4667	32	return java_lang_ClassLoader::loader_data(loader);
stefank@4667	33	}
stefank@4667	34
coleenp@4037	35	inline ClassLoaderData* ClassLoaderData::class_loader_data(oop loader) {
stefank@4667	36	ClassLoaderData* loader_data = class_loader_data_or_null(loader);
coleenp@4037	37	assert(loader_data != NULL, "Must be");
coleenp@4037	38	return loader_data;
coleenp@4037	39	}
coleenp@4037	40
coleenp@4037	41
coleenp@4304	42	inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader, TRAPS) {
coleenp@4037	43	assert(loader() != NULL,"Must be a class loader");
coleenp@4037	44	// Gets the class loader data out of the java/lang/ClassLoader object, if non-null
coleenp@4037	45	// it's already in the loader_data, so no need to add
mgerdin@5013	46	ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data(loader());
mgerdin@5013	47	if (loader_data) {
mgerdin@5013	48	return loader_data;
coleenp@4037	49	}
mgerdin@5013	50	return ClassLoaderDataGraph::add(loader, false, THREAD);
coleenp@4037	51	}