*** old/src/share/vm/opto/type.cpp	Mon Feb 16 15:29:39 2015
--- new/src/share/vm/opto/type.cpp	Mon Feb 16 15:29:38 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.

*** 3120,3130 ****
--- 3120,3129 ----
    // join report an interface back out.  This isn't possible but happens
    // because the type system doesn't interact well with interfaces.
    if (ftip != NULL && ktip != NULL &&
        ftip->is_loaded() &&  ftip->klass()->is_interface() &&
        ktip->is_loaded() && !ktip->klass()->is_interface()) {
      // Happens in a CTW of rt.jar, 320-341, no extra flags
      assert(!ftip->klass_is_exact(), "interface could not be exact");
      return ktip->cast_to_ptr_type(ftip->ptr());
    }
  
    return ft;