*** old/src/share/vm/opto/subnode.cpp	Thu Jan 23 12:10:17 2014
--- new/src/share/vm/opto/subnode.cpp	Thu Jan 23 12:10:17 2014

*** 1124,1138 ****
--- 1124,1142 ----
    // Change "bool tst (cmp con x)" into "bool ~tst (cmp x con)".
    // This moves the constant to the right.  Helps value-numbering.
    Node *cmp = in(1);
    if( !cmp->is_Sub() ) return NULL;
    int cop = cmp->Opcode();
-   if( cop == Op_FastLock || cop == Op_FastUnlock || cop == Op_FlagsProj) return NULL;
    Node *cmp1 = cmp->in(1);
    Node *cmp2 = cmp->in(2);
    if( !cmp1 ) return NULL;
  
+   if (_test._test == BoolTest::overflow || _test._test == BoolTest::no_overflow) {
+     return NULL;
+   }
+ 
    // Constant on left?
    Node *con = cmp1;
    uint op2 = cmp2->Opcode();
    // Move constants to the right of compare's to canonicalize.
    // Do not muck with Opaque1 nodes, as this indicates a loop