# HG changeset patch
# User never
# Date 1295453805 28800
# Node ID 2f33b03bd915727739b63b6ca72955fcb7902797
# Parent  c1a0ede55d6f61b414a52da40befb92c439a4568
7013008: 2/3 assert(method == NULL || check_method(method, bcp)) failed: bcp must point into method
Summary: The Relocator should pass a NULL methodOop when rewriting since its resource array can never contain breakpoints.
Reviewed-by: dcubed, kvn, coleenp

diff -r c1a0ede55d6f -r 2f33b03bd915 src/share/vm/runtime/relocator.hpp
--- a/src/share/vm/runtime/relocator.hpp	Wed Jan 19 07:41:39 2011 -0800
+++ b/src/share/vm/runtime/relocator.hpp	Wed Jan 19 08:16:45 2011 -0800
@@ -106,7 +106,7 @@
   // get the address of in the code_array
   inline char* addr_at(int bci) const             { return (char*) &code_array()[bci]; }
 
-  int  instruction_length_at(int bci)             { return Bytecodes::length_at(_method(), code_array() + bci); }
+  int  instruction_length_at(int bci)             { return Bytecodes::length_at(NULL, code_array() + bci); }
 
   // Helper methods
   int  align(int n) const                          { return (n+3) & ~3; }