Fri, 20 Sep 2013 10:53:28 +0200
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
duke@435 | 1 | # |
dcubed@3724 | 2 | # Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | # |
duke@435 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | # published by the Free Software Foundation. |
duke@435 | 8 | # |
duke@435 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | # accompanied this code). |
duke@435 | 14 | # |
duke@435 | 15 | # You should have received a copy of the GNU General Public License version |
duke@435 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | # |
trims@1907 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | # or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | # questions. |
duke@435 | 22 | # |
duke@435 | 23 | # |
duke@435 | 24 | |
duke@435 | 25 | HS_INTERNAL_NAME=jvm |
duke@435 | 26 | HS_FNAME=$(HS_INTERNAL_NAME).dll |
duke@435 | 27 | AOUT=$(HS_FNAME) |
duke@435 | 28 | SAWINDBG=sawindbg.dll |
duke@435 | 29 | GENERATED=../generated |
duke@435 | 30 | |
stefank@2325 | 31 | # Allow the user to turn off precompiled headers from the command line. |
stefank@2325 | 32 | !if "$(USE_PRECOMPILED_HEADER)" != "0" |
stefank@2325 | 33 | BUILD_PCH_FILE=_build_pch_file.obj |
stefank@2325 | 34 | !endif |
stefank@2325 | 35 | |
twisti@5109 | 36 | default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA |
duke@435 | 37 | |
duke@435 | 38 | !include ../local.make |
duke@435 | 39 | !include compile.make |
duke@435 | 40 | |
zgu@3900 | 41 | # _NMT_NOINLINE_ informs NMT that no inlining by Compiler |
zgu@3900 | 42 | CXX_FLAGS=$(CXX_FLAGS) $(DEBUG_OPT_OPTION) /D "_NMT_NOINLINE_" |
duke@435 | 43 | |
kamg@526 | 44 | !include $(WorkSpace)/make/windows/makefiles/vm.make |
duke@435 | 45 | !include local.make |
duke@435 | 46 | |
duke@435 | 47 | HS_BUILD_ID=$(HS_BUILD_VER)-debug |
duke@435 | 48 | |
duke@435 | 49 | # Force resources to be rebuilt every time |
duke@435 | 50 | $(Res_Files): FORCE |
duke@435 | 51 | |
sla@2369 | 52 | $(AOUT): $(Res_Files) $(Obj_Files) vm.def |
erikj@3518 | 53 | $(LD) @<< |
erikj@3518 | 54 | $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) |
duke@435 | 55 | << |
tbell@862 | 56 | !if "$(MT)" != "" |
tbell@862 | 57 | # The previous link command created a .manifest file that we want to |
tbell@862 | 58 | # insert into the linked artifact so we do not need to track it |
tbell@862 | 59 | # separately. Use ";#2" for .dll and ";#1" for .exe: |
tbell@862 | 60 | $(MT) /manifest $@.manifest /outputresource:$@;#2 |
tbell@862 | 61 | !endif |
dcubed@3724 | 62 | !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
dcubed@3724 | 63 | !if "$(ZIP_DEBUGINFO_FILES)" == "1" |
dcubed@3724 | 64 | $(ZIPEXE) -q $*.diz $*.map $*.pdb |
dcubed@3724 | 65 | $(RM) $*.map $*.pdb |
dcubed@3724 | 66 | !endif |
dcubed@3724 | 67 | !endif |
duke@435 | 68 | |
kamg@526 | 69 | !include $(WorkSpace)/make/windows/makefiles/shared.make |
kamg@526 | 70 | !include $(WorkSpace)/make/windows/makefiles/sa.make |