comparison src/share/vm/gc_implementation/g1/satbQueue.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 8847586c9037
children 52b4284cb496 2c6ef90f030a 42c091d63c72
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.
30 #include "oops/oop.inline.hpp" 30 #include "oops/oop.inline.hpp"
31 #include "runtime/mutexLocker.hpp" 31 #include "runtime/mutexLocker.hpp"
32 #include "runtime/thread.hpp" 32 #include "runtime/thread.hpp"
33 #include "runtime/vmThread.hpp" 33 #include "runtime/vmThread.hpp"
34 34
35 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
36
35 void ObjPtrQueue::flush() { 37 void ObjPtrQueue::flush() {
36 // The buffer might contain refs into the CSet. We have to filter it 38 // The buffer might contain refs into the CSet. We have to filter it
37 // first before we flush it, otherwise we might end up with an 39 // first before we flush it, otherwise we might end up with an
38 // enqueued buffer with refs into the CSet which breaks our invariants. 40 // enqueued buffer with refs into the CSet which breaks our invariants.
39 filter(); 41 filter();