comparison src/share/vm/code/nmethod.cpp @ 1931:48bbaead8b6c

Adjustments after merge with OpenJDK repository.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 16:39:35 +0100
parents 2d26b0046e0d
children 98dbef29f10b
comparison
equal deleted inserted replaced
1930:2d26b0046e0d 1931:48bbaead8b6c
793 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); 793 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
794 794
795 // Exception handler and deopt handler are in the stub section 795 // Exception handler and deopt handler are in the stub section
796 if (UseC1X) { 796 if (UseC1X) {
797 // c1x produces no stub section 797 // c1x produces no stub section
798 _exception_offset = instructions_offset() + offsets->value(CodeOffsets::Exceptions); 798 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);
799 _deoptimize_offset = instructions_offset() + offsets->value(CodeOffsets::Deopt); 799 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt);
800 if (has_method_handle_invokes()) { 800 if (has_method_handle_invokes()) {
801 _deoptimize_mh_offset = instructions_offset() + offsets->value(CodeOffsets::DeoptMH); 801 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH);
802 } else { 802 } else {
803 _deoptimize_mh_offset = -1; 803 _deoptimize_mh_offset = -1;
804 } 804 }
805 } else { 805 } else {
806 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); 806 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);