changeset 1389:d3a08f8c3c86

6855551: java -Xrunhprof crashes when running with classes compiled with targed=7 Reviewed-by: tbell, dcubed
author ohair
date Wed, 08 Jul 2009 09:12:17 -0700
parents d133d4052378
children ae60bb671e54 78a1ffa5a675
files src/share/demo/jvmti/java_crw_demo/java_crw_demo.c test/demo/jvmti/hprof/HelloWorld.java test/demo/jvmti/hprof/StackMapTableTest.java
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c	Wed Jul 08 09:11:24 2009 -0700
+++ b/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/test/demo/jvmti/hprof/HelloWorld.java	Wed Jul 08 09:11:24 2009 -0700
+++ b/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/test/demo/jvmti/hprof/StackMapTableTest.java	Wed Jul 08 09:11:24 2009 -0700
+++ b/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
  */