# HG changeset patch
# User Christian Wirth <christian.wirth@oracle.com>
# Date 1412853571 -7200
# Node ID 0e120f2819ce7f0700daf8a0b726c3834e45f110
# Parent  538cbc117324e25d810bb432ab18dcd06ef7cc5b# Parent  07462ba5a12aa46eb4e2f43af3d5f83fe95930e8
Merged

diff -r 07462ba5a12a -r 0e120f2819ce src/share/vm/opto/superword.hpp
--- a/src/share/vm/opto/superword.hpp	Thu Oct 09 12:10:00 2014 +0200
+++ b/src/share/vm/opto/superword.hpp	Thu Oct 09 13:19:31 2014 +0200
@@ -201,6 +201,30 @@
   static const SWNodeInfo initial;
 };
 
+//------------------------------OrderedPair---------------------------
+// Ordered pair of Node*.
+class OrderedPair VALUE_OBJ_CLASS_SPEC {
+ protected:
+  Node* _p1;
+  Node* _p2;
+ public:
+  OrderedPair() : _p1(NULL), _p2(NULL) {}
+  OrderedPair(Node* p1, Node* p2) {
+    if (p1->_idx < p2->_idx) {
+      _p1 = p1; _p2 = p2;
+    } else {
+      _p1 = p2; _p2 = p1;
+    }
+  }
+
+  bool operator==(const OrderedPair &rhs) {
+    return _p1 == rhs._p1 && _p2 == rhs._p2;
+  }
+  void print() { tty->print("  (%d, %d)", _p1->_idx, _p2->_idx); }
+
+  static const OrderedPair initial;
+};
+
 // -----------------------------SuperWord---------------------------------
 // Transforms scalar operations into packed (superword) operations.
 class SuperWord : public ResourceObj {
@@ -504,29 +528,4 @@
   void print();
 };
 
-
-//------------------------------OrderedPair---------------------------
-// Ordered pair of Node*.
-class OrderedPair VALUE_OBJ_CLASS_SPEC {
- protected:
-  Node* _p1;
-  Node* _p2;
- public:
-  OrderedPair() : _p1(NULL), _p2(NULL) {}
-  OrderedPair(Node* p1, Node* p2) {
-    if (p1->_idx < p2->_idx) {
-      _p1 = p1; _p2 = p2;
-    } else {
-      _p1 = p2; _p2 = p1;
-    }
-  }
-
-  bool operator==(const OrderedPair &rhs) {
-    return _p1 == rhs._p1 && _p2 == rhs._p2;
-  }
-  void print() { tty->print("  (%d, %d)", _p1->_idx, _p2->_idx); }
-
-  static const OrderedPair initial;
-};
-
 #endif // SHARE_VM_OPTO_SUPERWORD_HPP