Review Request: Zero and Shark fixes
Dr Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Mar 30 09:11:22 PDT 2011
On 30 March 2011 15:49, Christian Thalinger
<christian.thalinger at oracle.com> wrote:
> On Mar 30, 2011, at 4:38 PM, Dr Andrew John Hughes wrote:
>> On 30 March 2011 15:21, Christian Thalinger
>> <christian.thalinger at oracle.com> wrote:
>>> Nothing's pushed yet so we still can talk about and change it. What exactly do you want to split?
>>> -- Christian
>> Thanks. From the webrev, there seem to be at least three changes:
>> 1. Makefile changes which make sure the Shark files are once again
>> compiled (and which I believe would need to be reviewed by Kelly
>> 2. The trivial #ifndef addition which fixes a regression introduced by
>> the recent HotSpot security fix.
>> 3. The fix for the bug Gary mentioned which appears to mean API
>> changes (I don't completely understand this bit).
>> The first two have been tested in IcedTea6 and correspond to
>> regressions introduced by identifiable changesets.
>> I'm not sure of the impact of the third.
>> The hs20 stable branch needs 1. but does not need 2. at present as it
>> doesn't have the security fix to my knowledge.
>> I'd prefer they were added separately, but I could live with 1 & 2
>> being combined, provided the security fix went into OpenJDK6 first.
>> The build changes do need to be reviewed by Kelly:
>> so it would make sense to have 1 separate in that respect.
>> I would definitely like to see 3 separated as it's new and (AFAIK)
>> largely untested.
> Alright, let's split the work :-)
> Andrew, can you take care of 1. and send it to build-dev? I take the rest of the patch (2. and 3.) and push it as the one CR I created. I don't think it makes much sense to have an extra CR for 2.
I'm happy to handle 1 (as I say, I was going to get around to it
anyway). I would prefer 2 was as without it, Shark is currently
broken in OpenJDK6. 1 won't be an issue until hs20 is imported into
OpenJDK6. I don't know enough about 3, which is why I'm sceptical
about including that in a fix for a current Shark build failure in
OpenJDK6. So if you do combine them, I'll probably split them for 6
anyway, to be on the safe side.
> Andrew, what change caused 2.?
date: Mon Jan 31 15:17:26 2011 -0500
summary: 6878713: Verifier heap corruption, relating to backward jsrs
diff -r 2c8e1acf0433 -r a6f5011d46a9
--- a/src/share/vm/utilities/globalDefinitions_gcc.hpp Wed Jan 12
13:59:18 2011 -0800
+++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Jan 31
15:17:26 2011 -0500
@@ -72,6 +72,7 @@
It was fixed by Mark Wielaard in IcedTea when the security fixes were
added, but not upstreamed.
> -- Christian
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the hotspot-compiler-dev