*** old/src/share/vm/classfile/javaClasses.cpp	Fri Jan  8 01:43:04 2016
--- new/src/share/vm/classfile/javaClasses.cpp	Fri Jan  8 01:43:04 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2016, 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.

*** 127,137 ****
--- 127,137 ----
      tty->print_cr("all fields:");
      for (AllFieldStream fs(ik); !fs.done(); fs.next()) {
        tty->print_cr("  name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int());
      }
  #endif //PRODUCT
!     vm_exit_during_initialization("Invalid layout of preloaded class: use -XX:+TraceClassLoading to see the origin of the problem class");
!     vm_exit_during_initialization("Invalid layout of preloaded class: use -Xlog:classload=info to see the origin of the problem class");
    }
    dest_offset = fd.offset();
  }
  
  // Same as above but for "optional" offsets that might not be present in certain JDK versions

*** 3963,3973 ****
--- 3963,3973 ----
    tty->print_cr("all fields:");
    for (AllFieldStream fs(ik); !fs.done(); fs.next()) {
      tty->print_cr("  name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int());
    }
  #endif //PRODUCT
!   vm_exit_during_initialization("Invalid layout of preloaded class: use -XX:+TraceClassLoading to see the origin of the problem class");
!   vm_exit_during_initialization("Invalid layout of preloaded class: use -Xlog:classload=info to see the origin of the problem class");
    return -1;
  }
  
  void javaClasses_init() {
    JavaClasses::compute_offsets();