1.1 --- a/src/share/vm/runtime/vframe.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/vframe.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -106,7 +106,7 @@
1.11 class javaVFrame: public vframe {
1.12 public:
1.13 // JVM state
1.14 - virtual methodOop method() const = 0;
1.15 + virtual Method* method() const = 0;
1.16 virtual int bci() const = 0;
1.17 virtual StackValueCollection* locals() const = 0;
1.18 virtual StackValueCollection* expressions() const = 0;
1.19 @@ -158,7 +158,7 @@
1.20 class interpretedVFrame: public javaVFrame {
1.21 public:
1.22 // JVM state
1.23 - methodOop method() const;
1.24 + Method* method() const;
1.25 int bci() const;
1.26 StackValueCollection* locals() const;
1.27 StackValueCollection* expressions() const;
1.28 @@ -243,7 +243,7 @@
1.29 private:
1.30 oop _owner; // the object owning the monitor
1.31 BasicLock* _lock;
1.32 - oop _owner_klass; // klass if owner was scalar replaced
1.33 + oop _owner_klass; // klass (mirror) if owner was scalar replaced
1.34 bool _eliminated;
1.35 bool _owner_is_scalar_replaced;
1.36 public:
1.37 @@ -266,9 +266,9 @@
1.38 assert(!_owner_is_scalar_replaced, "should not be called for scalar replaced object");
1.39 return _owner;
1.40 }
1.41 - klassOop owner_klass() const {
1.42 + oop owner_klass() const {
1.43 assert(_owner_is_scalar_replaced, "should not be called for not scalar replaced object");
1.44 - return (klassOop)_owner_klass;
1.45 + return _owner_klass;
1.46 }
1.47 BasicLock* lock() const { return _lock; }
1.48 bool eliminated() const { return _eliminated; }
1.49 @@ -286,7 +286,7 @@
1.50 int _sender_decode_offset;
1.51
1.52 // Cached information
1.53 - methodOop _method;
1.54 + Method* _method;
1.55 int _bci;
1.56
1.57 // Should VM activations be ignored or not
1.58 @@ -311,7 +311,7 @@
1.59 }
1.60
1.61 // Accessors
1.62 - methodOop method() const { return _method; }
1.63 + Method* method() const { return _method; }
1.64 int bci() const { return _bci; }
1.65 intptr_t* frame_id() const { return _frame.id(); }
1.66 address frame_pc() const { return _frame.pc(); }
1.67 @@ -414,7 +414,7 @@
1.68 // Decode first part of scopeDesc
1.69 DebugInfoReadStream buffer(nm(), decode_offset);
1.70 _sender_decode_offset = buffer.read_int();
1.71 - _method = methodOop(buffer.read_oop());
1.72 + _method = buffer.read_method();
1.73 _bci = buffer.read_bci();
1.74
1.75 assert(_method->is_method(), "checking type of decoded method");
1.76 @@ -509,7 +509,7 @@
1.77
1.78
1.79 inline void vframeStreamCommon::fill_from_interpreter_frame() {
1.80 - methodOop method = _frame.interpreter_frame_method();
1.81 + Method* method = _frame.interpreter_frame_method();
1.82 intptr_t bcx = _frame.interpreter_frame_bcx();
1.83 int bci = method->validate_bci_from_bcx(bcx);
1.84 // 6379830 AsyncGetCallTrace sometimes feeds us wild frames.
