/hg/icedtea: Bump to b123.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 21 13:47:40 PDT 2011
changeset eeb7d84e7ae5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eeb7d84e7ae5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 21 20:47:22 2011 +0000
Bump to b123.
2011-03-21 Andrew John Hughes <ahughes at redhat.com>
* patches/4964490-generify_hotspot_jdi.patch:
Removed, in IcedTea tree.
* patches/hotspot/default/icedtea-includedb.patch,
* patches/no-precompiled.patch: Removed, obsolete with b123
HotSpot.
* patches/icedtea-ssl.patch: Old unneeded patch from GNU
Crypto days.
* Makefile.am: (OPENJDK_VERSION): Bump to b123.
(CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise. (ICEDTEA_PATCHES): Remove dropped patches.
* generated/java/nio/DirectByteBuffer.java,
* generated/java/nio/DirectByteBufferR.java: Regenerated for
b123.
* patches/boot/demos.patch: Regenerated.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-stringswitch.patch: Extended with new
cases.
* patches/boot/revert-6973616.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-sparc-trapsfix.patch,
* patches/hotspot/default/icedtea-text-relocations.patch,
* patches/icedtea-freetypeversion.patch,
* patches/icedtea-javafiles.patch,
* patches/icedtea-lc_ctype.patch,
* patches/icedtea-signed-types.patch,
* patches/icedtea-systemtap.patch: Regenerated.
diffstat:
ChangeLog | 45 +
Makefile.am | 36 +-
generated/java/nio/DirectByteBuffer.java | 35 +-
generated/java/nio/DirectByteBufferR.java | 25 +-
patches/4964490-generify_hotspot_jdi.patch | 256 -----
patches/boot/demos.patch | 16 +-
patches/boot/ecj-diamond.patch | 797 ++++++++--------
patches/boot/ecj-stringswitch.patch | 70 +
patches/boot/revert-6973616.patch | 8 +-
patches/hotspot/default/icedtea-gcc-suffix.patch | 11 +-
patches/hotspot/default/icedtea-includedb.patch | 11 -
patches/hotspot/default/icedtea-sparc-trapsfix.patch | 8 +-
patches/hotspot/default/icedtea-text-relocations.patch | 26 +-
patches/icedtea-freetypeversion.patch | 6 +-
patches/icedtea-javafiles.patch | 12 +-
patches/icedtea-lc_ctype.patch | 12 +-
patches/icedtea-signed-types.patch | 32 +-
patches/icedtea-ssl.patch | 41 -
patches/icedtea-systemtap.patch | 33 +-
patches/no-precompiled.patch | 33 -
20 files changed, 663 insertions(+), 850 deletions(-)
diffs (truncated from 2134 to 500 lines):
diff -r 0811a305cdb3 -r eeb7d84e7ae5 ChangeLog
--- a/ChangeLog Mon Mar 14 21:22:03 2011 +0000
+++ b/ChangeLog Mon Mar 21 20:47:22 2011 +0000
@@ -1,3 +1,48 @@
+2011-03-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/4964490-generify_hotspot_jdi.patch:
+ Removed, in IcedTea tree.
+ * patches/hotspot/default/icedtea-includedb.patch,
+ * patches/no-precompiled.patch:
+ Removed, obsolete with b123 HotSpot.
+ * patches/icedtea-ssl.patch:
+ Old unneeded patch from GNU Crypto days.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b123.
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove dropped patches.
+ * generated/java/nio/DirectByteBuffer.java,
+ * generated/java/nio/DirectByteBufferR.java:
+ Regenerated for b123.
+ * patches/boot/demos.patch:
+ Regenerated.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-stringswitch.patch:
+ Extended with new cases.
+ * patches/boot/revert-6973616.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/default/icedtea-text-relocations.patch,
+ * patches/icedtea-freetypeversion.patch,
+ * patches/icedtea-javafiles.patch,
+ * patches/icedtea-lc_ctype.patch,
+ * patches/icedtea-signed-types.patch,
+ * patches/icedtea-systemtap.patch:
+ Regenerated.
+
2011-03-14 Andrew John Hughes <ahughes at redhat.com>
Perform minimal compilation prior to bootstrap
diff -r 0811a305cdb3 -r eeb7d84e7ae5 Makefile.am
--- a/Makefile.am Mon Mar 14 21:22:03 2011 +0000
+++ b/Makefile.am Mon Mar 21 20:47:22 2011 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b117
+OPENJDK_VERSION = b123
-CORBA_CHANGESET = 06146786b141
-HOTSPOT_CHANGESET = 81685aa89446
-JAXP_CHANGESET = 43658f98c582
-JAXWS_CHANGESET = f3444af18aff
-JDK_CHANGESET = e7fc51780596
-LANGTOOLS_CHANGESET = fdf1b74d3437
-OPENJDK_CHANGESET = c94d1673451e
+CORBA_CHANGESET = eac2b25431d9
+HOTSPOT_CHANGESET = e452443363a7
+JAXP_CHANGESET = 17aa584100e9
+JAXWS_CHANGESET = 98bca2ec154b
+JDK_CHANGESET = e251bf6cbfb4
+LANGTOOLS_CHANGESET = a75f9777ae63
+OPENJDK_CHANGESET = 9bf0526ea1a0
-CORBA_SHA256SUM = 8d5a566e2d51d791d75f1ff25d5ae499317ec9391ed6bbc86eef483d15551d55
-HOTSPOT_SHA256SUM = 7ca6831eb7505c21b8607c7cf8d12cb182fca21c3a40c4696db737d56d80e54b
-JAXP_SHA256SUM = e0aa77b166b30d4d4052110956da831c59c43e22f8d6feeac62a06775bb083b6
-JAXWS_SHA256SUM = ff4124f3765ac5ebac5ecfd0391cb2a54857d80ac7f967f60630ce0879cfd1f4
-JDK_SHA256SUM = 0a01f5c43c8ef895addbc6c75adf4046d200c7a0d95d8056fa4f127a1b87feec
-LANGTOOLS_SHA256SUM = d200c9bcf1c1805e0800a8cd8017e99ff6d12db14a1fcca8e9b67c59dc5ed448
-OPENJDK_SHA256SUM = d7a3a531f0e064898e511f08f1127447b9171adce21ae4cecb3bca84b3f7b531
+CORBA_SHA256SUM = 106b6ff3765db0d608a7e5542a7b606fe10a2c1ebb155b866aef09f88ce481a7
+HOTSPOT_SHA256SUM = 045f86a3ccd383bde0be5d1f213d5d0165f3e30006081253c86a4545f85071a2
+JAXP_SHA256SUM = 009baa056f2b01e313470b71542b40baab511e179b63decca00b16081e6730bd
+JAXWS_SHA256SUM = 5990beb8e8f2144838d52f0948b088bf74ae3ddd748b996ddbb7e7ff1605389b
+JDK_SHA256SUM = 32f2d2172020046a671cca94fbe647bc9fd1af350f82090ca6edaf9ad2a537dc
+LANGTOOLS_SHA256SUM = c60849a838df72cb7b95562a97af75fa1e3e56fcc15678885a8e154463df8417
+OPENJDK_SHA256SUM = 33a62959bc1a553299983c90ffc2c3ac724ff42300eb1bb4cbc53907ede4635b
CACAO_VERSION = e321b101a9ee
CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
@@ -235,7 +235,6 @@
ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
- patches/icedtea-ssl.patch \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-demos.patch \
@@ -275,17 +274,14 @@
patches/security/icedtea-6592792.patch \
patches/security/icedtea-6733959.patch \
patches/security/icedtea-6755943.patch \
- patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
patches/icedtea-demo-swingapplet.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-disable-intree-ec.patch \
patches/icedtea-sources.patch \
- patches/no-precompiled.patch \
patches/parisc.patch \
patches/sh4-support.patch \
patches/jtreg-httpTest.patch \
- patches/icedtea-update-bootclasspath.patch \
- patches/4964490-generify_hotspot_jdi.patch
+ patches/icedtea-update-bootclasspath.patch
# Conditional patches
diff -r 0811a305cdb3 -r eeb7d84e7ae5 generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Mon Mar 14 21:22:03 2011 +0000
+++ b/generated/java/nio/DirectByteBuffer.java Mon Mar 21 20:47:22 2011 +0000
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,19 +18,20 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
// -- This file was mechanically generated: Do not edit! -- //
package java.nio;
+import java.io.FileDescriptor;
import sun.misc.Cleaner;
import sun.misc.Unsafe;
+import sun.misc.VM;
import sun.nio.ch.DirectBuffer;
-import sun.nio.ch.FileChannelImpl;
class DirectByteBuffer
@@ -114,9 +115,10 @@
//
DirectByteBuffer(int cap) { // package-private
- super(-1, 0, cap, cap, false);
+ super(-1, 0, cap, cap);
+ boolean pa = VM.isDirectMemoryPageAligned();
int ps = Bits.pageSize();
- int size = cap + ps;
+ long size = Math.max(1L, (long)cap + (pa ? ps : 0));
Bits.reserveMemory(size, cap);
long base = 0;
@@ -127,7 +129,7 @@
throw x;
}
unsafe.setMemory(base, size, (byte) 0);
- if (base % ps != 0) {
+ if (pa && (base % ps != 0)) {
// Round up to page boundary
address = base + ps - (base & (ps - 1));
} else {
@@ -144,7 +146,7 @@
// Invoked only by JNI: NewDirectByteBuffer(void*, long)
//
private DirectByteBuffer(long addr, int cap) {
- super(-1, 0, cap, cap, false);
+ super(-1, 0, cap, cap);
address = addr;
cleaner = null;
}
@@ -153,9 +155,12 @@
// For memory-mapped buffers -- invoked by FileChannelImpl via reflection
//
- protected DirectByteBuffer(int cap, long addr, Runnable unmapper) {
+ protected DirectByteBuffer(int cap, long addr,
+ FileDescriptor fd,
+ Runnable unmapper)
+ {
- super(-1, 0, cap, cap, true);
+ super(-1, 0, cap, cap, fd);
address = addr;
viewedBuffer = null;
cleaner = Cleaner.create(this, unmapper);
@@ -365,7 +370,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 0);
position(rem);
limit(capacity());
- discardMark();
+ discardMark();
return this;
@@ -441,6 +446,8 @@
+
+
byte _get(int i) { // package-private
return unsafe.getByte(address + i);
}
diff -r 0811a305cdb3 -r eeb7d84e7ae5 generated/java/nio/DirectByteBufferR.java
--- a/generated/java/nio/DirectByteBufferR.java Mon Mar 14 21:22:03 2011 +0000
+++ b/generated/java/nio/DirectByteBufferR.java Mon Mar 21 20:47:22 2011 +0000
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,19 +18,20 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
// -- This file was mechanically generated: Do not edit! -- //
package java.nio;
+import java.io.FileDescriptor;
import sun.misc.Cleaner;
import sun.misc.Unsafe;
+import sun.misc.VM;
import sun.nio.ch.DirectBuffer;
-import sun.nio.ch.FileChannelImpl;
class DirectByteBufferR
@@ -135,6 +136,7 @@
+
super(cap);
}
@@ -153,14 +155,17 @@
// For memory-mapped buffers -- invoked by FileChannelImpl via reflection
//
- protected DirectByteBufferR(int cap, long addr, Runnable unmapper) {
+ protected DirectByteBufferR(int cap, long addr,
+ FileDescriptor fd,
+ Runnable unmapper)
+ {
- super(cap, addr, unmapper);
+ super(cap, addr, fd, unmapper);
}
@@ -441,6 +446,8 @@
+
+
byte _get(int i) { // package-private
return unsafe.getByte(address + i);
}
diff -r 0811a305cdb3 -r eeb7d84e7ae5 patches/4964490-generify_hotspot_jdi.patch
--- a/patches/4964490-generify_hotspot_jdi.patch Mon Mar 14 21:22:03 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1300124050 0
-# Node ID e452443363a7f9dcff60404a0ef0fa5369380ddd
-# Parent 7f338a5e5e66b24a3dd82c57c8d1847e5c6f3878
-4964490: Generify HotSpot JDI implementation
-Summary: Fix errors produced by removing -source/-target 1.4 from SA build.
-
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java Mon Mar 14 17:34:10 2011 +0000
-@@ -55,7 +55,7 @@
- synchronized(lock) {
- if (useMethodInvoke) {
- try {
-- Method method = HelloWorld.class.getMethod("e", null);
-+ Method method = HelloWorld.class.getMethod("e");
- Integer result = (Integer) method.invoke(null, new Object[0]);
- return result.intValue();
- }
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -52,12 +52,10 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- byte other = ((ByteValue)obj).value();
-- return value() - other;
-+ public int compareTo(ByteValue byteVal) {
-+ return value() - byteVal.value();
- }
-
--
- public Type type() {
- return vm.theByteType();
- }
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -52,9 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- char other = ((CharValue)obj).value();
-- return value() - other;
-+ public int compareTo(CharValue charVal) {
-+ return value() - charVal.value();
- }
-
- public Type type() {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -186,7 +186,7 @@
- // assert isVMVersionMismatch(throwable), "not a VMVersionMismatch"
- Class expClass = throwable.getClass();
- Method targetVersionMethod = expClass.getMethod("getTargetVersion", new Class[0]);
-- return (String) targetVersionMethod.invoke(throwable, null);
-+ return (String) targetVersionMethod.invoke(throwable);
- }
-
- /** If the causal chain has a sun.jvm.hotspot.runtime.VMVersionMismatchException,
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -45,8 +45,8 @@
- }
- }
-
-- public int compareTo(Object obj) {
-- double other = ((DoubleValue)obj).value();
-+ public int compareTo(DoubleValue doubleVal) {
-+ double other = doubleVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -145,8 +145,7 @@
- }
-
- // From interface Comparable
-- public int compareTo(Object object) {
-- Field field = (Field)object;
-+ public int compareTo(Field field) {
- ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
- int rc = declaringType.compareTo(field.declaringType());
- if (rc == 0) {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -52,8 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- float other = ((FloatValue)obj).value();
-+ public int compareTo(FloatValue floatVal) {
-+ float other = floatVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -52,9 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- int other = ((IntegerValue)obj).value();
-- return value() - other;
-+ public int compareTo(IntegerValue integerVal) {
-+ return value() - integerVal.value();
- }
-
- public Type type() {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -67,8 +67,8 @@
- return (int)method.hashCode() + slot();
- }
-
-- public int compareTo(Object object) {
-- LocalVariableImpl other = (LocalVariableImpl)object;
-+ public int compareTo(LocalVariable localVar) {
-+ LocalVariableImpl other = (LocalVariableImpl) localVar;
- int rc = method.compareTo(other.method);
- if (rc == 0) {
- rc = slot() - other.slot();
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -78,8 +78,7 @@
- return method().hashCode() + (int)codeIndex();
- }
-
-- public int compareTo(Object object) {
-- LocationImpl other = (LocationImpl)object;
-+ public int compareTo(Location other) {
- int rc = method().compareTo(other.method());
- if (rc == 0) {
- long diff = codeIndex() - other.codeIndex();
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -52,8 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- long other = ((LongValue)obj).value();
-+ public int compareTo(LongValue longVal) {
-+ long other = longVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -200,8 +200,7 @@
- }
-
- // From interface Comparable
-- public int compareTo(Object object) {
-- Method method = (Method)object;
-+ public int compareTo(Method method) {
- ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
- int rc = declaringType.compareTo(method.declaringType());
- if (rc == 0) {
-diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java Mon Jan 10 16:57:36 2011 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java Mon Mar 14 17:34:10 2011 +0000
-@@ -99,7 +99,7 @@
- return saKlass.hashCode();
- }
-
-- public int compareTo(Object object) {
-+ public int compareTo(ReferenceType refType) {
- /*
- * Note that it is critical that compareTo() == 0
- * implies that equals() == true. Otherwise, TreeSet
More information about the distro-pkg-dev
mailing list