Joseph D. Darcy wrote:
Kelly O'Hair wrote:


Joe Darcy wrote:
Kelly O'Hair wrote:

OpenJDK6 changes for JDI. I'm ready to push.

I would like approvals from Joe, Jim, Alan, Dan, and Tim.

Approved with comments.

test/com/sun/jdi/StringConvertTest.sh
 26 #  @test @(#)StringConvertTest.sh       1.6 03/04/09

An expanded sccs keywork crept back in!

Otherwise, it looks fine.

Do you think a diff of the files compared to JDK 7 would be informative?

I actually did that on quite a few of the directories.
Well, diff -r -w that is. Ignored whitespace differences.


I thought you might say what the diffs were, "only non-whitespace diffs in ..." :-)

-Joe


I went back and did another detailed diff between the latest in jdk7/tl and
what I have. I did miss a few items, namely the removal of -source 1.5
on the JDI tests, Copyright year updates, and I missed a jhat source file
change for the 2GB limit bug 6614052.

Now when I compare these directories:
  src/*/classes/com/sun/tools/hat
  src/*/classes/com/sun/tools/jdi
  src/*/back
  src/*/transport
  src/*/demo/jvmti
  test/com/sun/jdi
  test/demo/jvmti
  test/sun/tools/jhat

There are only 2 differences between the jdk7 and jdk6 files for JDI:

1. Solaris 8 stdint.h file missing change:

diff -w jdk7-tl/jdk/src/solaris/back/util_md.h src/solaris/back/util_md.h
30d29
< #include <stdint.h>  /* To get uintptr_t */
31a31,40
> /* To get uintptr_t */
> #ifdef LINUX
> #include <stdint.h>
> #else
> /* The file stdint.h is not on Solaris 8 machines. */
> #include <sys/int_types.h>
> #include <sys/int_limits.h>
> #include <sys/int_const.h>
> #endif
>

2. Explicit difference for testing StackMap attributes:

diff -w jdk7-tl/jdk/test/demo/jvmti/hprof/StackMapTableTest.java 
test/demo/jvmti/hprof/StackMapTableTest.java
30c30
<  * @compile -source 7 -g:lines HelloWorld.java
---
>  * @compile -source 1.6 -g:lines HelloWorld.java

I updated the webrev at:
  http://cr.openjdk.java.net/~ohair/openjdk6/jdk6-serviceability-update/webrev/

-kto

Reply via email to