RFC: PR690: Shark fails to JIT using hs20

[Xerxes Rånby]

On 2011-04-21 00:31, Dr Andrew John Hughes wrote:
> On 12:28 Wed 20 Apr     , Xerxes Rånby wrote:
>> Hi the attached patches updates icedtea6-1.10 and icedtea6 trunk to make the Shark JIT work when using HotSpot 20 and later:

>> I have tested these patches using the following three configurations:
>>
>> ../icedtea6-1.10/configure --enable-shark --disable-bootstrap --disable-docs --with-hotspot-build
>>
>> ../icedtea6/configure --enable-shark --disable-docs --disable-bootstrap
>> ../icedtea6/configure --enable-shark --disable-bootstrap --disable-docs --with-hotspot-build
>>
>>
>> Ok to push to IcedTea6-1.10 release branch?
>>
>> Ok to push to IcedTea6 trunk?
>>
>
> What part of 7032458 is being used here?  I'm concerned that neither the NEWS item
> nor the patch file mention 7032458.  Are there parts of 7032458 that don't apply?
There are parts of 7032458 that do not apply. a zero fix and some 
non-hs20 parts. I have posted this patch upstream for review in hope to 
get a new bug id that only track this hs20 regression.

>
> The patch claims to be for hs20 but you seem to be applying it unconditionally
> (and thus for hs19 too).

The patch for icedtea6 trunk are applying it unconditionally since it 
are already using hs20 by default.
Index: icedtea6/Makefile.am
===================================================================
--- icedtea6.orig/Makefile.am	2011-04-20 11:39:13.640753000 +0200
+++ icedtea6/Makefile.am	2011-04-20 11:39:55.248753002 +0200
@@ -336,7 +336,8 @@
  	patches/revert-6885123.patch \
  	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
  	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
-	patches/shark-llvm-2.9.patch
+	patches/shark-llvm-2.9.patch \
+	patches/pr690-shark-jit-hs20.patch

  if WITH_ALT_HSBUILD
  ICEDTEA_PATCHES += \



The patch for icedtea6-1.10 are conditionally for WITH_ALT_HSBUILD to 
only apply for hs20.
>> Index: icedtea6-1.10/Makefile.am
>> ===================================================================
>> --- icedtea6-1.10.orig/Makefile.am	2011-04-20 11:42:37.816753001 +0200
>> +++ icedtea6-1.10/Makefile.am	2011-04-20 11:44:13.344753002 +0200
>> @@ -335,6 +335,7 @@
>>   if WITH_ALT_HSBUILD
>>   ICEDTEA_PATCHES += \
>>   	patches/pr639-broken_shark_build.patch \
>> +	patches/pr690-shark-jit-hs20.patch \
>>   	patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
>>   else
>>   ICEDTEA_PATCHES += \