comparison src/share/vm/memory/genOopClosures.hpp @ 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 da91efe96a93
children
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 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.
197 197
198 class VerifyOopClosure: public OopClosure { 198 class VerifyOopClosure: public OopClosure {
199 protected: 199 protected:
200 template <class T> inline void do_oop_work(T* p) { 200 template <class T> inline void do_oop_work(T* p) {
201 oop obj = oopDesc::load_decode_heap_oop(p); 201 oop obj = oopDesc::load_decode_heap_oop(p);
202 guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, (oopDesc*) obj)); 202 guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, p2i((oopDesc*) obj)));
203 } 203 }
204 public: 204 public:
205 virtual void do_oop(oop* p); 205 virtual void do_oop(oop* p);
206 virtual void do_oop(narrowOop* p); 206 virtual void do_oop(narrowOop* p);
207 static VerifyOopClosure verify_oop; 207 static VerifyOopClosure verify_oop;