I've fixed the broken build.

The CR for the fix is 7173329 and the fix was reviewed by Andrew Gross.

Sorry for the inconvenience,

Mike


On May 31 2012, at 13:30 , Mike Duigou wrote:

> In preparing the patches for 6924259 and 7118743 I made a mistake or 
> assumption at at some point regarding the ordering the patches would be 
> applied. My second commit last night broke the JDK7u-dev build. The fix is 
> very straightforward and is correctly applied in the Java 8 workspace. I will 
> create a P1 issue and commit the fix without waiting for explicit commit 
> approval.
> 
> Sorry for this inconvenience.
> 
> Mike
> 
> On May 31 2012, at 13:10 , Seán Coffey wrote:
> 
>> Mike,
>> 
>> Maybe I'm missing something here - but should the murmur3_32 call in String 
>> be the same as jdk8 call now ?
>> 
>> It's still referencing offset, count fields
>> JDK 8 :
>> 
>>> h = sun.misc.Hashing.murmur3_32(HASHING_SEED, value, 0, value.length);
>> 
>>> # Running javac:
>>> /suspool/home/jdk/jdk1.7.0_04/bin/javac -J-XX:ThreadStackSize=768 
>>> -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions -J-XX:-LogVMOutput 
>>> -J-client -J-Xmx512m -J-Xms512m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m 
>>> -source 7 -target 7 -encoding ascii 
>>> -Xbootclasspath:../../../build/solaris-sparc/classes -sourcepath 
>>> ../../../src/closed/solaris/classes:../../../src/closed/share/classes:../../../build/solaris-sparc/gensrc:../../../src/solaris/classes:../../../src/share/classes
>>>  -d ../../../build/solaris-sparc/classes 
>>> @../../../build/solaris-sparc/tmp/java/java.lang/java/.classes.list.filtered
>>> ../../../src/share/classes/java/lang/String.java:3092: error: cannot find 
>>> symbol
>>>          h = sun.misc.Hashing.murmur3_32(HASHING_SEED, value, offset, 
>>> count);
>>>                                                               ^
>>> symbol:   variable offset
>>> location: class String
>>> ../../../src/share/classes/java/lang/String.java:3092: error: cannot find 
>>> symbol
>>>          h = sun.misc.Hashing.murmur3_32(HASHING_SEED, value, offset, 
>>> count);
>>>                                                                       ^
>>> symbol:   variable count
>>> location: class String
>> 
>> 
>> regards,
>> Sean.
>> 
>> 
>> On 31/05/2012 15:43, [email protected] wrote:
>>> Changeset: e1c679a00712
>>> Author:    mduigou
>>> Date:      2012-05-17 10:06 -0700
>>> URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/e1c679a00712
>>> 
>>> 6924259: Remove offset and count fields from java.lang.String
>>> Summary: Removes the use of shared character array buffers by String along 
>>> with the two fields needed to support the use of shared buffers.
>>> Reviewed-by: mduigou, forax
>>> Contributed-by: [email protected]
>>> 
>>> ! src/share/classes/java/lang/Integer.java
>>> ! src/share/classes/java/lang/Long.java
>>> ! src/share/classes/java/lang/String.java
>>> ! src/share/classes/java/lang/StringCoding.java
>>> 
> 

Reply via email to