diff 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
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp	Tue Nov 30 14:53:30 2010 +0100
+++ b/src/share/vm/code/nmethod.cpp	Tue Nov 30 16:39:35 2010 +0100
@@ -795,10 +795,10 @@
     // Exception handler and deopt handler are in the stub section
     if (UseC1X) {
       // c1x produces no stub section
-      _exception_offset        = instructions_offset() + offsets->value(CodeOffsets::Exceptions);
-      _deoptimize_offset       = instructions_offset() + offsets->value(CodeOffsets::Deopt);
+      _exception_offset        = _stub_offset          + offsets->value(CodeOffsets::Exceptions);
+      _deoptimize_offset       = _stub_offset          + offsets->value(CodeOffsets::Deopt);
       if (has_method_handle_invokes()) {
-        _deoptimize_mh_offset    = instructions_offset() + offsets->value(CodeOffsets::DeoptMH);
+        _deoptimize_mh_offset  = _stub_offset          + offsets->value(CodeOffsets::DeoptMH);
       } else {
         _deoptimize_mh_offset  = -1;
       }