# HG changeset patch
# User asaha
# Date 1256165015 25200
# Node ID 47ca7aa20d9752c65a094ac6fb8338becbdb698a
# Parent  6de2c9c36168c4ef48b173368fd368ddd24b3e05
6858208: jvm crash when specifying TypeProfileWidth=0 on jdk 6.0
Reviewed-by: never

diff -r 6de2c9c36168 -r 47ca7aa20d97 src/cpu/sparc/vm/interp_masm_sparc.cpp
--- a/src/cpu/sparc/vm/interp_masm_sparc.cpp	Tue Oct 20 19:55:13 2009 -0400
+++ b/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed Oct 21 15:43:35 2009 -0700
@@ -1696,6 +1696,9 @@
 void InterpreterMacroAssembler::record_klass_in_profile_helper(
                                         Register receiver, Register scratch,
                                         int start_row, Label& done) {
+  if (TypeProfileWidth == 0)
+    return;
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.
diff -r 6de2c9c36168 -r 47ca7aa20d97 src/cpu/x86/vm/interp_masm_x86_32.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_32.cpp	Tue Oct 20 19:55:13 2009 -0400
+++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed Oct 21 15:43:35 2009 -0700
@@ -1262,6 +1262,9 @@
                                         Register receiver, Register mdp,
                                         Register reg2,
                                         int start_row, Label& done) {
+  if (TypeProfileWidth == 0)
+    return;
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.
diff -r 6de2c9c36168 -r 47ca7aa20d97 src/cpu/x86/vm/interp_masm_x86_64.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp	Tue Oct 20 19:55:13 2009 -0400
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed Oct 21 15:43:35 2009 -0700
@@ -1272,6 +1272,9 @@
                                         Register receiver, Register mdp,
                                         Register reg2,
                                         int start_row, Label& done) {
+  if (TypeProfileWidth == 0)
+    return;
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.