*** old/src/share/vm/opto/cfgnode.cpp	Mon Feb 16 15:29:05 2015
--- new/src/share/vm/opto/cfgnode.cpp	Mon Feb 16 15:29:03 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 1013,1023 ****
--- 1013,1022 ----
      const TypeInstPtr *jtip = (jtp != NULL) ? jtp->isa_instptr() : NULL;
      const TypeKlassPtr *jtkp = (jtp != NULL) ? jtp->isa_klassptr() : NULL;
      if( jtip && ttip ) {
        if( jtip->is_loaded() &&  jtip->klass()->is_interface() &&
            ttip->is_loaded() && !ttip->klass()->is_interface() ) {
          // Happens in a CTW of rt.jar, 320-341, no extra flags
          assert(ft == ttip->cast_to_ptr_type(jtip->ptr()) ||
                 ft->isa_narrowoop() && ft->make_ptr() == ttip->cast_to_ptr_type(jtip->ptr()), "");
          jt = ft;
        }
      }