/hg/release/icedtea7-forest-2.3/hotspot: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 01fe4d85c01c in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=01fe4d85c01c
author: erikj
date: Thu Oct 10 16:41:17 2013 +0100

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 22ef5097ef1a in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=22ef5097ef1a
author: sgabdura
date: Mon Jul 15 10:22:43 2013 +0400

	8016256: Make finalization final
	Reviewed-by: hseigel


changeset a34906833a8a in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=a34906833a8a
author: iklam
date: Sat Aug 24 00:14:46 2013 -0700

	8023683: Enhance class file parsing
	Summary: Use the value returned by REALLOC_RESOURCE_ARRAY()
	Reviewed-by: coleenp, ahgross


diffstat:

 make/windows/makefiles/compile.make        |   7 +++++--
 make/windows/makefiles/sa.make             |   3 +++
 src/share/vm/classfile/classFileParser.cpp |  13 ++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (88 lines):

diff -r fa3171a9cec3 -r a34906833a8a make/windows/makefiles/compile.make
--- a/make/windows/makefiles/compile.make	Thu Sep 19 00:00:25 2013 +0100
+++ b/make/windows/makefiles/compile.make	Sat Aug 24 00:14:46 2013 -0700
@@ -140,6 +140,7 @@
 !if "$(MSC_VER)" == "1600"
 COMPILER_NAME=VS2010
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 # By default, we do not want to use the debug version of the msvcrt.dll file
@@ -170,6 +171,7 @@
 PRODUCT_OPT_OPTION   = /O2 /Oy-
 FASTDEBUG_OPT_OPTION = /O2 /Oy-
 DEBUG_OPT_OPTION     = /Od
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2005"
@@ -186,6 +188,7 @@
 # Manifest Tool - used in VS2005 and later to adjust manifests stored
 # as resources inside build artifacts.
 MT=mt.exe
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2008"
@@ -209,8 +212,8 @@
 # as resources inside build artifacts.
 MT=mt.exe
 !if "$(BUILDARCH)" == "i486"
-LD_FLAGS = /SAFESEH $(LD_FLAGS)
-!endif
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 # Compile for space above time.
diff -r fa3171a9cec3 -r a34906833a8a make/windows/makefiles/sa.make
--- a/make/windows/makefiles/sa.make	Thu Sep 19 00:00:25 2013 +0100
+++ b/make/windows/makefiles/sa.make	Sat Aug 24 00:14:46 2013 -0700
@@ -107,6 +107,9 @@
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
 SA_LFLAGS = $(SA_LFLAGS) /map /debug
 !endif
+!if "$(BUILDARCH)" == "i486"
+SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
+!endif
 
 # Note that we do not keep sawindbj.obj around as it would then
 # get included in the dumpbin command in build_vm_def.sh
diff -r fa3171a9cec3 -r a34906833a8a src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Thu Sep 19 00:00:25 2013 +0100
+++ b/src/share/vm/classfile/classFileParser.cpp	Sat Aug 24 00:14:46 2013 -0700
@@ -1821,8 +1821,8 @@
           }
           if (lvt_cnt == max_lvt_cnt) {
             max_lvt_cnt <<= 1;
-            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_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, 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] =
             parse_localvariable_table(code_length,
@@ -1851,8 +1851,8 @@
           // Parse local variable type table
           if (lvtt_cnt == max_lvtt_cnt) {
             max_lvtt_cnt <<= 1;
-            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_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, 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] =
             parse_localvariable_table(code_length,
@@ -3762,9 +3762,8 @@
   for (int index = 0; index < num_methods; index++) {
     methodOop m = (methodOop)methods->obj_at(index);
 
-    // skip private, static and <init> methods
-    if ((!m->is_private()) &&
-        (!m->is_static()) &&
+    // skip static and <init> methods
+    if ((!m->is_static()) &&
         (m->name() != vmSymbols::object_initializer_name())) {
 
       Symbol* name = m->name();