--- old/src/share/vm/runtime/sharedRuntime.hpp 2013-10-15 13:10:25.838317892 +0200 +++ new/src/share/vm/runtime/sharedRuntime.hpp 2013-10-15 13:10:25.714317896 +0200 @@ -600,14 +600,13 @@ address _i2c_entry; address _c2i_entry; address _c2i_unverified_entry; + bool _contains_all_stubs; #ifdef ASSERT // Captures code and signature used to generate this adapter when // verifing adapter equivalence. unsigned char* _saved_code; - int _code_length; - BasicType* _saved_sig; - int _total_args_passed; + int _saved_code_length; #endif void init(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry, address c2i_unverified_entry) { @@ -615,11 +614,10 @@ _i2c_entry = i2c_entry; _c2i_entry = c2i_entry; _c2i_unverified_entry = c2i_unverified_entry; + _contains_all_stubs = false; #ifdef ASSERT _saved_code = NULL; - _code_length = 0; - _saved_sig = NULL; - _total_args_passed = 0; + _saved_code_length = 0; #endif } @@ -632,6 +630,8 @@ address get_i2c_entry() const { return _i2c_entry; } address get_c2i_entry() const { return _c2i_entry; } address get_c2i_unverified_entry() const { return _c2i_unverified_entry; } + void set_contains_all_stubs(bool val) { _contains_all_stubs = val; } + bool contains_all_stubs() { return _contains_all_stubs; } address base_address(); void relocate(address new_base); @@ -644,8 +644,8 @@ #ifdef ASSERT // Used to verify that code generated for shared adapters is equivalent - void save_code(unsigned char* code, int length, int total_args_passed, BasicType* sig_bt); - bool compare_code(unsigned char* code, int length, int total_args_passed, BasicType* sig_bt); + void save_code (unsigned char* code, int length); + bool compare_code(unsigned char* code, int length); #endif //virtual void print_on(outputStream* st) const; DO NOT USE