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

     1.1 --- a/src/share/vm/c1/c1_Canonicalizer.hpp	Thu Sep 02 11:40:02 2010 -0700
     1.2 +++ b/src/share/vm/c1/c1_Canonicalizer.hpp	Fri Sep 03 17:51:07 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2010, 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 @@ -24,9 +24,11 @@
    1.11  
    1.12  class Canonicalizer: InstructionVisitor {
    1.13   private:
    1.14 +  Compilation *_compilation;
    1.15    Instruction* _canonical;
    1.16    int _bci;
    1.17  
    1.18 +  Compilation *compilation()                     { return _compilation; }
    1.19    void set_canonical(Value x);
    1.20    void set_bci(int bci)                          { _bci = bci; }
    1.21    void set_constant(jint x)                      { set_canonical(new Constant(new IntConstant(x))); }
    1.22 @@ -43,7 +45,9 @@
    1.23                          int* scale);
    1.24  
    1.25   public:
    1.26 -  Canonicalizer(Value x, int bci)                { _canonical = x; _bci = bci; if (CanonicalizeNodes) x->visit(this); }
    1.27 +  Canonicalizer(Compilation* c, Value x, int bci) : _compilation(c), _canonical(x), _bci(bci) {
    1.28 +    if (CanonicalizeNodes) x->visit(this);
    1.29 +  }
    1.30    Value canonical() const                        { return _canonical; }
    1.31    int bci() const                                { return _bci; }
    1.32  
    1.33 @@ -92,5 +96,5 @@
    1.34    virtual void do_UnsafePrefetchRead (UnsafePrefetchRead*  x);
    1.35    virtual void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
    1.36    virtual void do_ProfileCall    (ProfileCall*     x);
    1.37 -  virtual void do_ProfileCounter (ProfileCounter*  x);
    1.38 +  virtual void do_ProfileInvoke  (ProfileInvoke*   x);
    1.39  };