Mercurial > hg > truffle
view src/share/vm/shark/sharkMemoryManager.cpp @ 12301:2c022e432e10
8024974: Incorrect use of GC_locker::is_active()
Summary: SymbolTable and StringTable can make calls to GC_locker::is_active() outside a safepoint. This isn't safe because the GC_locker active state (lock count) is only updated at a safepoint and only remains valid as long as _needs_gc is true. However, outside a safepoint_needs_gc can change to false at any time, which makes it impossible to do a correct call to is_active() in that context. In this case these calls can just be removed since the input argument to basic_add() should never be on the heap and so there's no need to check the GC_locker state. This change also adjusts the assert() in is_active() to makes sure all calls to this function are always done under a safepoint.
Reviewed-by: brutisso, dcubed
Contributed-by: per.liden@oracle.com
author | stefank |
---|---|
date | Fri, 20 Sep 2013 10:53:28 +0200 |
parents | 2cd5e15048e6 |
children | 81ccf2c854c7 |
line wrap: on
line source
/* * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. * */ #include "precompiled.hpp" #include "shark/llvmHeaders.hpp" #include "shark/sharkEntry.hpp" #include "shark/sharkMemoryManager.hpp" using namespace llvm; void SharkMemoryManager::AllocateGOT() { mm()->AllocateGOT(); } unsigned char* SharkMemoryManager::getGOTBase() const { return mm()->getGOTBase(); } unsigned char* SharkMemoryManager::allocateStub(const GlobalValue* F, unsigned StubSize, unsigned Alignment) { return mm()->allocateStub(F, StubSize, Alignment); } unsigned char* SharkMemoryManager::startFunctionBody(const Function* F, uintptr_t& ActualSize) { return mm()->startFunctionBody(F, ActualSize); } void SharkMemoryManager::endFunctionBody(const Function* F, unsigned char* FunctionStart, unsigned char* FunctionEnd) { mm()->endFunctionBody(F, FunctionStart, FunctionEnd); SharkEntry *entry = get_entry_for_function(F); if (entry != NULL) entry->set_code_limit(FunctionEnd); } unsigned char* SharkMemoryManager::startExceptionTable(const Function* F, uintptr_t& ActualSize) { return mm()->startExceptionTable(F, ActualSize); } void SharkMemoryManager::endExceptionTable(const Function* F, unsigned char* TableStart, unsigned char* TableEnd, unsigned char* FrameRegister) { mm()->endExceptionTable(F, TableStart, TableEnd, FrameRegister); } void SharkMemoryManager::setMemoryWritable() { mm()->setMemoryWritable(); } void SharkMemoryManager::setMemoryExecutable() { mm()->setMemoryExecutable(); } void SharkMemoryManager::deallocateExceptionTable(void *ptr) { mm()->deallocateExceptionTable(ptr); } void SharkMemoryManager::deallocateFunctionBody(void *ptr) { mm()->deallocateFunctionBody(ptr); } uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment) { return mm()->allocateGlobal(Size, Alignment); } void* SharkMemoryManager::getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) { return mm()->getPointerToNamedFunction(Name, AbortOnFailure); } uint8_t* SharkMemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) { return mm()->allocateCodeSection(Size, Alignment, SectionID); } uint8_t* SharkMemoryManager::allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) { return mm()->allocateDataSection(Size, Alignment, SectionID); } void SharkMemoryManager::setPoisonMemory(bool poison) { mm()->setPoisonMemory(poison); } unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size, unsigned int Alignment) { return mm()->allocateSpace(Size, Alignment); }