src/hotspot/share/opto/subnode.hpp

*** 278,288 ****
  //------------------------------BoolTest---------------------------------------
  // Convert condition codes to a boolean test value (0 or -1).
  // We pick the values as 3 bits; the low order 2 bits we compare against the
  // condition codes, the high bit flips the sense of the result.
  struct BoolTest {
!   enum mask { eq = 0, ne = 4, le = 5, ge = 7, lt = 3, gt = 1, overflow = 2, no_overflow = 6, illegal = 8 };
    mask _test;
    BoolTest( mask btm ) : _test(btm) {}
    const Type *cc2logical( const Type *CC ) const;
    // Commute the test.  I use a small table lookup.  The table is created as
    // a simple char array where each element is the ASCII version of a 'mask'
--- 278,288 ----
  //------------------------------BoolTest---------------------------------------
  // Convert condition codes to a boolean test value (0 or -1).
  // We pick the values as 3 bits; the low order 2 bits we compare against the
  // condition codes, the high bit flips the sense of the result.
  struct BoolTest {
!   enum mask { eq = 0, ne = 4, le = 5, ge = 7, lt = 3, gt = 1, overflow = 2, no_overflow = 6, never = 8, illegal = 9 };
    mask _test;
    BoolTest( mask btm ) : _test(btm) {}
    const Type *cc2logical( const Type *CC ) const;
    // Commute the test.  I use a small table lookup.  The table is created as
    // a simple char array where each element is the ASCII version of a 'mask'
*** 291,300 ****
--- 291,301 ----
    mask negate( ) const { return mask(_test^4); }
    bool is_canonical( ) const { return (_test == BoolTest::ne || _test == BoolTest::lt || _test == BoolTest::le || _test == BoolTest::overflow); }
    bool is_less( )  const { return _test == BoolTest::lt || _test == BoolTest::le; }
    bool is_greater( ) const { return _test == BoolTest::gt || _test == BoolTest::ge; }
    void dump_on(outputStream *st) const;
+   mask merge(BoolTest other) const;
  };
  
  //------------------------------BoolNode---------------------------------------
  // A Node to convert a Condition Codes to a Logical result.
  class BoolNode : public Node {