comparison src/share/vm/memory/genMarkSweep.cpp @ 356:1ee8caae33af

Merge
author tonyp
date Thu, 21 Aug 2008 23:36:31 -0400
parents 850fdf70db2b
children c96030fff130
comparison
equal deleted inserted replaced
355:0edda524b58c 356:1ee8caae33af
1 /* 1 /*
2 * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 2001-2008 Sun Microsystems, Inc. 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.
188 #endif 188 #endif
189 } 189 }
190 190
191 191
192 void GenMarkSweep::deallocate_stacks() { 192 void GenMarkSweep::deallocate_stacks() {
193
194 if (!UseG1GC) {
195 GenCollectedHeap* gch = GenCollectedHeap::heap();
196 gch->release_scratch();
197 }
198
193 if (_preserved_oop_stack) { 199 if (_preserved_oop_stack) {
194 delete _preserved_mark_stack; 200 delete _preserved_mark_stack;
195 _preserved_mark_stack = NULL; 201 _preserved_mark_stack = NULL;
196 delete _preserved_oop_stack; 202 delete _preserved_oop_stack;
197 _preserved_oop_stack = NULL; 203 _preserved_oop_stack = NULL;