changeset 497:3bd88fb254b4

merge
author Lukas Stadler <lukas.stadler@jku.at>
date Thu, 26 Jul 2012 17:12:45 +0200
parents b4050524c2ff 6ca8164f788f
children c86e09a2f56b
files
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/meth-lazy-7023639.patch	Thu Jul 26 17:10:47 2012 +0200
+++ b/meth-lazy-7023639.patch	Thu Jul 26 17:12:45 2012 +0200
@@ -2,7 +2,7 @@
 6984705: JSR 292 method handle creation should not go through JNI
 Summary: remove assembly code for JDK 7 chained method handles
 Reviewed-by: jrose, twisti, kvn, mhaupt
-Contributed-by: jrose, twisti, mhaupt
+Contributed-by: John Rose <john.r.rose@oracle.com>, Christian Thalinger <christian.thalinger@oracle.com>, Michael Haupt <michael.haupt@oracle.com>
 
 diff --git a/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
 --- a/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -422,13 +422,16 @@
 diff --git a/make/solaris/makefiles/fastdebug.make b/make/solaris/makefiles/fastdebug.make
 --- a/make/solaris/makefiles/fastdebug.make
 +++ b/make/solaris/makefiles/fastdebug.make
-@@ -36,6 +36,11 @@
+@@ -36,6 +36,14 @@
  ifeq ("${Platform_compiler}", "sparcWorks")
  OPT_CFLAGS/SLOWER = -xO2
  
 +ifeq ($(COMPILER_REV_NUMERIC), 510)
 +# CC 5.10 has bug XXXXX with -xO4
 +OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER)
++# jvm98 crashes on solaris-i586-fastdebug and solaris-sparc-fastdebug with stack overflow
++OPT_CFLAGS/escape.o = $(OPT_CFLAGS) -xspace
++OPT_CFLAGS/matcher.o = $(OPT_CFLAGS) -xspace
 +endif # COMPILER_REV_NUMERIC == 510
 +
  ifeq ($(COMPILER_REV_NUMERIC), 509)
@@ -3915,7 +3918,7 @@
 +                  StubRoutines::code1()->code_begin(), StubRoutines::code1()->code_end(),
 +                  L_ok);
 +    if (StubRoutines::code2() != NULL)
-+      range_check(masm, O7, O0, O1, 
++      range_check(masm, O7, O0, O1,
 +                  StubRoutines::code2()->code_begin(), StubRoutines::code2()->code_end(),
 +                  L_ok);
 +    const char* msg = "i2c adapter must return to an interpreter frame";