comparison src/share/vm/oops/instanceRefKlass.cpp @ 17937:78bbf4d43a14

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
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 190899198332
children a8ea2f110d87
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
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.
42 #include "gc_implementation/parNew/parOopClosures.inline.hpp" 42 #include "gc_implementation/parNew/parOopClosures.inline.hpp"
43 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" 43 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
44 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" 44 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
45 #include "oops/oop.pcgc.inline.hpp" 45 #include "oops/oop.pcgc.inline.hpp"
46 #endif // INCLUDE_ALL_GCS 46 #endif // INCLUDE_ALL_GCS
47
48 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
47 49
48 template <class T> 50 template <class T>
49 void specialized_oop_follow_contents(InstanceRefKlass* ref, oop obj) { 51 void specialized_oop_follow_contents(InstanceRefKlass* ref, oop obj) {
50 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj); 52 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
51 T heap_oop = oopDesc::load_heap_oop(referent_addr); 53 T heap_oop = oopDesc::load_heap_oop(referent_addr);