Mercurial > jdk8-mips64-public > hotspot / annotate
make/windows/makefiles/generated.make@2c022e432e10 (annotated)
make/windows/makefiles/generated.make
Fri, 20 Sep 2013 10:53:28 +0200
- author
- stefank
- date
- Fri, 20 Sep 2013 10:53:28 +0200
- changeset 5769
- 2c022e432e10
- parent 5237
- f2110083203d
- child 6876
- 710a3c8b516e
- child 9858
- b985cbb00e68
- permissions
- -rw-r--r--
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 | # |
| sla@5237 | 2 | # Copyright (c) 2005, 2013, 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 | !include ../local.make |
| stefank@2314 | 26 | !include $(WorkSpace)/make/windows/makefiles/projectcreator.make |
| duke@435 | 27 | !include local.make |
| duke@435 | 28 | |
| duke@435 | 29 | # Pick up rules for building JVMTI (JSR-163) |
| duke@435 | 30 | JvmtiOutDir=jvmtifiles |
| kamg@526 | 31 | !include $(WorkSpace)/make/windows/makefiles/jvmti.make |
| duke@435 | 32 | |
| sla@5237 | 33 | # Pick up rules for building trace |
| sla@5237 | 34 | TraceOutDir=tracefiles |
| sla@5237 | 35 | !include $(WorkSpace)/make/windows/makefiles/trace.make |
| sla@5237 | 36 | |
| duke@435 | 37 | # Pick up rules for building SA |
| kamg@526 | 38 | !include $(WorkSpace)/make/windows/makefiles/sa.make |
| duke@435 | 39 | |
| stefank@2314 | 40 | AdlcOutDir=adfiles |
| stefank@2314 | 41 | |
| duke@435 | 42 | !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") |
| sla@5237 | 43 | default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles |
| duke@435 | 44 | !else |
| sla@5237 | 45 | default:: $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles |
| duke@435 | 46 | !endif |
| duke@435 | 47 | |
| stefank@2314 | 48 | buildobjfiles: |
| stefank@2314 | 49 | @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make |
| duke@435 | 50 | |
| stefank@2314 | 51 | classes/ProjectCreator.class: $(ProjectCreatorSources) |
| duke@435 | 52 | if exist classes rmdir /s /q classes |
| duke@435 | 53 | mkdir classes |
| stefank@2314 | 54 | $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources) |
| duke@435 | 55 | |
| duke@435 | 56 | !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") |
| duke@435 | 57 | |
| sla@2369 | 58 | !include $(WorkSpace)/make/windows/makefiles/compile.make |
| kamg@526 | 59 | !include $(WorkSpace)/make/windows/makefiles/adlc.make |
| duke@435 | 60 | |
| duke@435 | 61 | !endif |
| duke@435 | 62 | |
| kamg@526 | 63 | !include $(WorkSpace)/make/windows/makefiles/shared.make |
