hg: jdk6/jdk6/hotspot: 3 new changesets

[Andrew John Hughes]

On 15 December 2009 01:47,  <daniel.daugherty at sun.com> wrote:

>
> Changeset: 98cd9901c161
> Author:    dcubed
> Date:      2009-12-14 10:05 -0700
> URL:       http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/98cd9901c161
>
> 6849968: 3/2 JVMTI tests fails on jdk5.0 with hs14
> Summary: If a JVMTI agent asks for version 1.0, then it should get version 1.0 semantics.
> Reviewed-by: dholmes, ohair
>
> ! src/share/vm/prims/jvmtiEnv.cpp
> ! src/share/vm/prims/jvmtiEnvBase.cpp
> ! src/share/vm/prims/jvmtiEnvBase.hpp
> ! src/share/vm/prims/jvmtiExport.cpp
> ! src/share/vm/prims/jvmtiExport.hpp
> ! src/share/vm/prims/jvmtiHpp.xsl
>

When trying to update OpenJDK6 to HotSpot 16 this is causing a build failure:

g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/asm
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/ci
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/classfile
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/code
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/compiler
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/shared
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/g1
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parNew
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_interface
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/interpreter
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/libadt
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/memory
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/oops
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/opto
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/runtime
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/services
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/utilities
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/cpu/x86/vm
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os/linux/vm
-I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os_cpu/linux_x86/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b13\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\""
-DHOTSPOT_LIB_ARCH=\"amd64\"
-DJRE_RELEASE_VERSION="\"1.6.0-internal-andrew_17_feb_2010_12_54-b00\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DCOMPILER2 -fPIC -fno-rtti
-fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -O3
-fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1
-fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare    -c
-o jvmtiEnvThreadState.o
/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp
/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp:126:
error: prototype for 'JvmtiEnvBase::JvmtiEnvBase()' does not match any
in class 'JvmtiEnvBase'
/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:44:
error: candidates are: JvmtiEnvBase::JvmtiEnvBase(const JvmtiEnvBase&)
/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:95:
error:                 JvmtiEnvBase::JvmtiEnvBase(jint)

Is the fix still necessary?  If so,is there an appropriate default
version we could use to provide a no-arg constructor again?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8