Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6855551: java -Xrunhprof crashes when running with classes compiled with targed=7
authorohair
Wed, 08 Jul 2009 09:12:17 -0700
changeset 3223 24e98ad0c62e
parent 3222 432b8f34c3b0
child 3224 3aa65803ae07
child 3467 b9f3a2f34102
6855551: java -Xrunhprof crashes when running with classes compiled with targed=7 Reviewed-by: tbell, dcubed
jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c file | annotate | diff | comparison | revisions
jdk/test/demo/jvmti/hprof/HelloWorld.java file | annotate | diff | comparison | revisions
jdk/test/demo/jvmti/hprof/StackMapTableTest.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c	Wed Jul 08 09:11:24 2009 -0700
+++ b/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c	Wed Jul 08 09:12:17 2009 -0700
@@ -263,8 +263,8 @@
     (void)sprintf(buf,
                 "CRW ASSERTION FAILURE: %s (%s:%s:%d)",
                 condition,
-                ci->name==0?"?":ci->name,
-                mi->name==0?"?":mi->name,
+                ci->name==NULL?"?":ci->name,
+                (mi==NULL||mi->name==NULL)?"?":mi->name,
                 byte_code_offset);
     fatal_error(ci, buf, file, line);
 }
--- a/jdk/test/demo/jvmti/hprof/HelloWorld.java	Wed Jul 08 09:11:24 2009 -0700
+++ b/jdk/test/demo/jvmti/hprof/HelloWorld.java	Wed Jul 08 09:12:17 2009 -0700
@@ -24,7 +24,7 @@
 
 /* HelloWorld:
  *
- *   Sample target appluication for HPROF tests
+ *   Sample target application for HPROF tests
  *
  */
 
--- a/jdk/test/demo/jvmti/hprof/StackMapTableTest.java	Wed Jul 08 09:11:24 2009 -0700
+++ b/jdk/test/demo/jvmti/hprof/StackMapTableTest.java	Wed Jul 08 09:12:17 2009 -0700
@@ -23,11 +23,11 @@
 
 
 /* @test
- * @bug 6266289 6299047
+ * @bug 6266289 6299047 6855180 6855551
  * @summary Test jvmti hprof and java_crw_demo with StackMapTable attributes
  *
  * @compile ../DemoRun.java
- * @compile -source 1.6 -g:lines HelloWorld.java
+ * @compile -source 7 -g:lines HelloWorld.java
  * @build StackMapTableTest
  * @run main StackMapTableTest HelloWorld
  */
jdk-sandbox