archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Chris Hegarty 2013-10-13 21:14:04 +01:00
commit fafe7da1e5
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/make/windows/makefiles/compile.make
View file

@ -180,6 +180,7 @@ DEBUG_OPT_OPTION = /Od
PRODUCT_OPT_OPTION = /O2 /Oy- PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy- FASTDEBUG_OPT_OPTION = /O2 /Oy-
DEBUG_OPT_OPTION = /Od DEBUG_OPT_OPTION = /Od
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2005" !if "$(COMPILER_NAME)" == "VS2005"
@ -198,6 +199,7 @@ LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2008" !if "$(COMPILER_NAME)" == "VS2008"
@ -211,6 +213,7 @@ LD_FLAGS = /manifest $(LD_FLAGS)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2010" !if "$(COMPILER_NAME)" == "VS2010"
@ -240,9 +243,11 @@ LD_FLAGS = /manifest $(LD_FLAGS)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
!if "$(BUILDARCH)" == "i486" SAFESEH_FLAG = /SAFESEH
LD_FLAGS = /SAFESEH $(LD_FLAGS)
!endif !endif
!if "$(BUILDARCH)" == "i486"
LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
!endif !endif
# If NO_OPTIMIZATIONS is defined in the environment, turn everything off # If NO_OPTIMIZATIONS is defined in the environment, turn everything off

3
hotspot/make/windows/makefiles/sa.make
View file

@ -107,6 +107,9 @@ SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
!if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
SA_LFLAGS = $(SA_LFLAGS) -map -debug SA_LFLAGS = $(SA_LFLAGS) -map -debug
!endif !endif
!if "$(BUILDARCH)" == "i486"
SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
!endif
# Note that we do not keep sawindbj.obj around as it would then # Note that we do not keep sawindbj.obj around as it would then
# get included in the dumpbin command in build_vm_def.sh # get included in the dumpbin command in build_vm_def.sh

13
hotspot/src/share/vm/classfile/classFileParser.cpp
View file

@ -2197,8 +2197,8 @@ methodHandle ClassFileParser::parse_method(bool is_interface,
} }
if (lvt_cnt == max_lvt_cnt) { if (lvt_cnt == max_lvt_cnt) {
max_lvt_cnt <<= 1; max_lvt_cnt <<= 1;
REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt); localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt); localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
} }
localvariable_table_start[lvt_cnt] = localvariable_table_start[lvt_cnt] =
parse_localvariable_table(code_length, parse_localvariable_table(code_length,
@ -2226,8 +2226,8 @@ methodHandle ClassFileParser::parse_method(bool is_interface,
// Parse local variable type table // Parse local variable type table
if (lvtt_cnt == max_lvtt_cnt) { if (lvtt_cnt == max_lvtt_cnt) {
max_lvtt_cnt <<= 1; max_lvtt_cnt <<= 1;
REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt); localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt); localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
} }
localvariable_type_table_start[lvtt_cnt] = localvariable_type_table_start[lvtt_cnt] =
parse_localvariable_table(code_length, parse_localvariable_table(code_length,
@ -4484,9 +4484,8 @@ void ClassFileParser::check_final_method_override(instanceKlassHandle this_klass
for (int index = 0; index < num_methods; index++) { for (int index = 0; index < num_methods; index++) {
Method* m = methods->at(index); Method* m = methods->at(index);
// skip private, static and <init> methods // skip static and <init> methods
if ((!m->is_private()) && if ((!m->is_static()) &&
(!m->is_static()) &&
(m->name() != vmSymbols::object_initializer_name())) { (m->name() != vmSymbols::object_initializer_name())) {
Symbol* name = m->name(); Symbol* name = m->name();

2
hotspot/src/share/vm/services/diagnosticCommand.cpp
View file

@ -48,7 +48,7 @@ void DCmdRegistrant::register_dcmds(){
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false));
#if INCLUDE_SERVICES // Heap dumping/inspection supported #if INCLUDE_SERVICES // Heap dumping/inspection supported
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassStatsDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassStatsDCmd>(full_export, true, false));
#endif // INCLUDE_SERVICES #endif // INCLUDE_SERVICES