Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/code/scopeDesc.hpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/code/scopeDesc.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 @@ -27,17 +27,17 @@
    1.11  
    1.12  #include "code/debugInfo.hpp"
    1.13  #include "code/pcDesc.hpp"
    1.14 -#include "oops/methodOop.hpp"
    1.15 +#include "oops/method.hpp"
    1.16  #include "utilities/growableArray.hpp"
    1.17  
    1.18  // SimpleScopeDesc is used when all you need to extract from
    1.19 -// a given pc,nmethod pair is a methodOop and a bci. This is
    1.20 +// a given pc,nmethod pair is a Method* and a bci. This is
    1.21  // quite a bit faster than allocating a full ScopeDesc, but
    1.22  // very limited in abilities.
    1.23  
    1.24  class SimpleScopeDesc : public StackObj {
    1.25   private:
    1.26 -  methodOop _method;
    1.27 +  Method* _method;
    1.28    int _bci;
    1.29  
    1.30   public:
    1.31 @@ -46,11 +46,11 @@
    1.32      assert(pc_desc != NULL, "Must be able to find matching PcDesc");
    1.33      DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
    1.34      int ignore_sender = buffer.read_int();
    1.35 -    _method           = methodOop(buffer.read_oop());
    1.36 +    _method           = buffer.read_method();
    1.37      _bci              = buffer.read_bci();
    1.38    }
    1.39  
    1.40 -  methodOop method() { return _method; }
    1.41 +  Method* method() { return _method; }
    1.42    int bci() { return _bci; }
    1.43  };
    1.44  
    1.45 @@ -68,7 +68,7 @@
    1.46    ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop);
    1.47  
    1.48    // JVM state
    1.49 -  methodHandle method()   const { return _method; }
    1.50 +  Method* method()      const { return _method; }
    1.51    int          bci()      const { return _bci;    }
    1.52    bool should_reexecute() const { return _reexecute; }
    1.53    bool return_oop()       const { return _return_oop; }
    1.54 @@ -94,7 +94,7 @@
    1.55    ScopeDesc(const ScopeDesc* parent);
    1.56  
    1.57    // JVM state
    1.58 -  methodHandle  _method;
    1.59 +  Method*       _method;
    1.60    int           _bci;
    1.61    bool          _reexecute;
    1.62    bool          _return_oop;