comparison src/share/vm/memory/space.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 78bbf4d43a14
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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 "utilities/globalDefinitions.hpp" 42 #include "utilities/globalDefinitions.hpp"
43 #include "utilities/macros.hpp" 43 #include "utilities/macros.hpp"
44 44
45 void SpaceMemRegionOopsIterClosure::do_oop(oop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); } 45 void SpaceMemRegionOopsIterClosure::do_oop(oop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); }
46 void SpaceMemRegionOopsIterClosure::do_oop(narrowOop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); } 46 void SpaceMemRegionOopsIterClosure::do_oop(narrowOop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); }
47
48 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
47 49
48 HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top, 50 HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
49 HeapWord* top_obj) { 51 HeapWord* top_obj) {
50 if (top_obj != NULL) { 52 if (top_obj != NULL) {
51 if (_sp->block_is_obj(top_obj)) { 53 if (_sp->block_is_obj(top_obj)) {