Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/superword.hpp	Mon Feb 17 10:32:35 2020 +0100
     1.2 +++ b/src/share/vm/opto/superword.hpp	Thu Feb 20 11:34:01 2020 +0100
     1.3 @@ -201,6 +201,31 @@
     1.4    static const SWNodeInfo initial;
     1.5  };
     1.6  
     1.7 +// JVMCI: OrderedPair is moved up to deal with compilation issues on Windows
     1.8 +//------------------------------OrderedPair---------------------------
     1.9 +// Ordered pair of Node*.
    1.10 +class OrderedPair VALUE_OBJ_CLASS_SPEC {
    1.11 + protected:
    1.12 +  Node* _p1;
    1.13 +  Node* _p2;
    1.14 + public:
    1.15 +  OrderedPair() : _p1(NULL), _p2(NULL) {}
    1.16 +  OrderedPair(Node* p1, Node* p2) {
    1.17 +    if (p1->_idx < p2->_idx) {
    1.18 +      _p1 = p1; _p2 = p2;
    1.19 +    } else {
    1.20 +      _p1 = p2; _p2 = p1;
    1.21 +    }
    1.22 +  }
    1.23 +
    1.24 +  bool operator==(const OrderedPair &rhs) {
    1.25 +    return _p1 == rhs._p1 && _p2 == rhs._p2;
    1.26 +  }
    1.27 +  void print() { tty->print("  (%d, %d)", _p1->_idx, _p2->_idx); }
    1.28 +
    1.29 +  static const OrderedPair initial;
    1.30 +};
    1.31 +
    1.32  // -----------------------------SuperWord---------------------------------
    1.33  // Transforms scalar operations into packed (superword) operations.
    1.34  class SuperWord : public ResourceObj {
    1.35 @@ -506,29 +531,4 @@
    1.36    void print();
    1.37  };
    1.38  
    1.39 -
    1.40 -//------------------------------OrderedPair---------------------------
    1.41 -// Ordered pair of Node*.
    1.42 -class OrderedPair VALUE_OBJ_CLASS_SPEC {
    1.43 - protected:
    1.44 -  Node* _p1;
    1.45 -  Node* _p2;
    1.46 - public:
    1.47 -  OrderedPair() : _p1(NULL), _p2(NULL) {}
    1.48 -  OrderedPair(Node* p1, Node* p2) {
    1.49 -    if (p1->_idx < p2->_idx) {
    1.50 -      _p1 = p1; _p2 = p2;
    1.51 -    } else {
    1.52 -      _p1 = p2; _p2 = p1;
    1.53 -    }
    1.54 -  }
    1.55 -
    1.56 -  bool operator==(const OrderedPair &rhs) {
    1.57 -    return _p1 == rhs._p1 && _p2 == rhs._p2;
    1.58 -  }
    1.59 -  void print() { tty->print("  (%d, %d)", _p1->_idx, _p2->_idx); }
    1.60 -
    1.61 -  static const OrderedPair initial;
    1.62 -};
    1.63 -
    1.64  #endif // SHARE_VM_OPTO_SUPERWORD_HPP