comparison src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6 78bbf4d43a14
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2010, 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.
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" 26 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
27 #include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp" 27 #include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp"
28 #include "oops/markOop.inline.hpp" 28 #include "oops/markOop.inline.hpp"
29 #include "oops/oop.inline.hpp" 29 #include "oops/oop.inline.hpp"
30
31 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
30 32
31 ///////////////////////////////////////////////////////////////////////// 33 /////////////////////////////////////////////////////////////////////////
32 //// PromotionInfo 34 //// PromotionInfo
33 ///////////////////////////////////////////////////////////////////////// 35 /////////////////////////////////////////////////////////////////////////
34 36