8170812: Metaspace corruption caused by incorrect memory size for MethodCounters
Reviewed-by: kbarrett, coleenp

8145148: InterfaceMethod CP entry pointing to a class should cause ICCE
Summary: pass tag in LinkInfo and check that resolved method type matches tag, fix tests.
Reviewed-by: sspitsyn, minqi

8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
8151546: nsk/jvmti/RedefineClasses/StressRedefine fails in hs nightly
Summary: ConstantPool::resolve_constant_at_impl() isn't thread safe for MethodHandleInError and MethodTypeInError and Constant pool merging is not thread safe for source_file_name.
Reviewed-by: sspitsyn, dcubed

8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
Summary: Use align_metadata_size, align_metadata_offset and is_metadata_aligned for metadata rather than align_object_size, etc. Use wordSize rather than HeapWordSize for metadata. Use align_ptr_up rather than align_pointer_up (all the related functions are ptr).
Reviewed-by: hseigel, jmasa, cjplummer

Merge

8146401: Clean up oop.hpp: add inline directives and fix header files
Reviewed-by: coleenp

Merge

8134994: use separate VMStructs databases for SA and JVMCI
Reviewed-by: kbarrett

8140485: Class load and creation cleanup
Reviewed-by: hseigel, coleenp, sspitsyn

8143324: Backout JDK-8087223
Reviewed-by: coleenp, acorn

8087223: InterfaceMethod CP entry pointing to a class should cause ICCE
Summary: Check constantTag for class constant data consistency at method resolution
Reviewed-by: coleenp, vlivanov

Merge

8140274: methodHandles and constantPoolHandles should be passed as const references
Summary: modified code to use const reference parameters
Reviewed-by: sspitsyn, twisti

8140452: Internal Error memory/allocation.cpp:179
Summary: use const ref & and avoid copy ctor
Reviewed-by: coleenp

8136421: JEP 243: Java-Level JVM Compiler Interface
Reviewed-by: ihse, alanb, roland, coleenp, iveresov, kvn, kbarrett

8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
Reviewed-by: sspitsyn, coleenp

8059340: ConstantPool::_resolved_references is missing in heap dump
Reviewed-by: sspitsyn, stefank, twisti

8008678: JSR 292: constant pool reconstitution must support pseudo strings
Summary: Keep orig idx from pseudo-string to UTF8, use 2nd lsb CPSlot to mark pseudo-string.
Reviewed-by: coleenp, jrose
Contributed-by: serguei.spitsyn@oracle.com

8062808: Turn on the -Wreturn-type warning
Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett

8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
8044209: nsk/split_verifier/security/coglio06 fails with exit code 97 - missing 'prohibited package name'
Summary: Fix resolution error saving.
Reviewed-by: lfoltan, sspitsyn, hseigel, ctornqvi

8049325: Introduce and clean up umbrella headers for the files in the cpu subdirectories.
Summary: Introduce and clean up umbrella headers for the files in the cpu subdirectories.
Reviewed-by: lfoltan, coleenp, dholmes

8026977: NPG: Remove ConstantPool::lock
Summary: Write klass and resolved_references constant pool fields lock free.
Reviewed-by: jrose, twisti

Merge

8023697: failed class resolution reports different class name in detail message for the first and subsequent times
Summary: Cache detail message when we cache exception for constant pool resolution.
Reviewed-by: acorn, twisti, jrose

8036956: remove EnableInvokeDynamic flag
Summary: The EnableInvokeDynamic flag and all support code is removed because it is not longer used in JDK 9.
Reviewed-by: kvn, twisti
Contributed-by: Tobias Hartmann <tobias.hartmann@oracle.com>

8031820: NPG: Fix remaining references to metadata as oops in comments
8012125: Comments for ConstantPoolCache should reflect the addition of resolved_references in ConstantPool
Summary: Updated comments in metadata header files, and renamed this_oop variables to this_cp or this_k when referring to constant pool or classes.
Reviewed-by: stefank, jmasa

8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
Summary: Revert changes in JDK-8008962
Reviewed-by: coleenp, sspitsyn

8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
Summary: Need to refetch each method from InstanceKlass after all safepoints. Removed leaky PreviousVersionInfo code.
Reviewed-by: coleenp, sspitsyn

Merge

8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
Summary: reference_map[] array had uninitialized junk that was causing a bogus bootstrap method to be found.
Reviewed-by: hseigel, dcubed, sspitsyn

8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
Summary: Enhance method resolution and resulting data structures, plus some refactoring.
Reviewed-by: twisti, acorn, jrose

8003557: NPG: Klass* const k should be const Klass* k.
Summary: With NPG, const KlassOop klass which is in fact a definition converted to Klass* const, which is not the original intention. The right usage is converting them to const Klass*.
Reviewed-by: coleenp, kvn
Contributed-by: yumin.qi@oracle.com

8008962: NPG: Memory regression: One extra Monitor per ConstantPool
Summary: Re-use InstanceKlass::_init_lock locking ConstantPool as well.
Reviewed-by: dholmes, coleenp, acorn

8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
Summary: References from operands to CP entries and back must be correct after CP merge
Reviewed-by: coleenp, twisti
Contributed-by: serguei.spitsyn@oracle.com

8000797: NPG: is_pseudo_string_at() doesn't work
Summary: Zero Symbol* for constant pool strings to indicate pseudo_strings (objects that aren't strings). Clean up JVM_CONSTANT_Object and unused flags.
Reviewed-by: sspitsyn, jrose

Merge

6479360: PrintClassHistogram improvements
Summary: jcmd <pid> GC.class_stats (UnlockDiagnosticVMOptions)
Reviewed-by: coleenp, hseigel, sla, acorn
Contributed-by: ioi.lam@oracle.com

8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
Summary: When constant pool is copied in merge_constant_pools the invokedynamic operands must be copied before.
Reviewed-by: coleenp, twisti
Contributed-by: serguei.spitsyn@oracle.com

8006040: NPG: on_stack processing wastes space in ConstantPool
Summary: Added on_stack bit to flags. Also MetadataMarkOnStack is used for more than JVMTI so had to be moved.
Reviewed-by: dholmes, stefank

8006548: version wrong in new constantPool code
Summary: fix increment problem with saved_version
Reviewed-by: dholmes

7174978: NPG: Fix bactrace builder for class redefinition
Summary: Remove Method* from backtrace but save version so redefine classes doesn't give inaccurate line numbers. Removed old Merlin API with duplicate code.
Reviewed-by: dholmes, sspitsyn

8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
Summary: Change types of above methods and field to InstanceKlass and remove unneeded casts from the source files.
Reviewed-by: dholmes, coleenp, zgu
Contributed-by: harold.seigel@oracle.com

Merge

8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
Summary: Capitalize these metadata types (and objArrayKlass)
Reviewed-by: stefank, twisti, kvn

7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
Reviewed-by: jrose, kvn

7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
Summary: Need to restore the vtable in metadata when we restore the type from the shared archive.
Reviewed-by: acorn, jcoomes, jmasa, jrose

6964458: Reimplement class meta-data storage to use native memory
Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>