6863420: os::javaTimeNanos() go backward on Solaris x86 Summary: Use new atomic long load method Atomic::load() to load max_hrtime. Reviewed-by: never, ysr, johnc, phh, dcubed, acorn

6851386: assert(b->find_node(def) < j,"uses must follow definitions") Summary: Add additional check for a tight loop. Reviewed-by: never

6861984: solaris version of libsaproc.so should support SA_ALTROOT directly Reviewed-by: kvn, twisti

6868991: JPRT: elide GCBasher_G1 test on winx64 until 6867250 is resolved Summary: JPRT: elide GCBasher_G1 test on winx64 until 6867250 is resolved Reviewed-by: jcoomes

6819077: G1: first GC thread coming late into the GC. Summary: The first worker thread is delayed when entering the GC because it clears the card count table that is used in identifying hot cards. Replace the card count table with a dynamically sized evicting hash table that includes an epoch based counter. Reviewed-by: iveresov, tonyp

6865703: G1: Parallelize hot card cache cleanup Summary: Have the GC worker threads clear the hot card cache in parallel by having each worker thread claim a chunk of the card cache and process the cards in that chunk. The size of the chunks that each thread will claim is determined at VM initialization from the size of the card cache and the number of worker threads. Reviewed-by: jmasa, tonyp

Merge

6843292: "Expect to be beyond new region unless impacting another region" assertion too strong Summary: In the assertion allow for collision with the guard page. Reviewed-by: tonyp, ysr, jcoomes

6862534: -XX:NewRatio completely ignored when combined with -XX:+UseConcMarkSweepG Summary: Use NewRatio if it is explicitly set. Reviewed-by: ysr, jcoomes

Merge

6866591: G1: print update buffer processing stats more often Summary: It adds parameter -XX:+G1SummarizeRSetStatsPeriod that causes update buffer processing information to be printed periodically. It also includes two small formatting changes. Reviewed-by: jmasa, jcoomes, ysr

6864886: G1: rename -XX parameters related to update buffers Summary: renaming a couple of update buffer-related parameters to make them more understandable and consistent. Reviewed-by: iveresov, ysr

Merge

Merge

6862295: JDWP threadid changes during debugging session (leading to ingored breakpoints) Summary: Correctly count full GC operations for framework collectors. Add ForceFullGCJVMTIEpilogues as a future work around if needed. Reviewed-by: jcoomes, alanb, ysr

Merge

6864003: Modify JVM_FindClassFromBootLoader to return null if class not found Summary: JVM_FindClassFromBootLoader returns null if class not found Reviewed-by: acorn, alanb, dholmes

6840305: Discrepancy in system memory details (when 4G or greater) reported by JVM and Windows OS Summary: GlobalMemoryStatus() does not report correct memory usage when the system has more than 4gb of RAM. GlobalMemoryStatusEx() should be used in place of GlobalMemoryStatus(). Reviewed-by: kamg, coleenp

6850957: Honor -XX:OnOutOfMemoryError when array size exceeds VM limit Summary: call report_java_out_of_memory("Requested array size exceeds VM limit") Reviewed-by: tbell, dholmes, alanb, ysr Contributed-by: jeremymanson@google.com

6857194: Add hotspot perf counters to aid class loading performance measurement Summary: Add new jvmstat counters to measure detailed class loading time Reviewed-by: acorn, kamg

6871765: Bump the HS16 build number to 08 Summary: Update the HS16 build number to 08 Reviewed-by: jcoomes

Added tag jdk7-b70 for changeset 0caafb54c87f

Merge

6872177: JCE framework and provider builds broken following -target 7 changes Reviewed-by: ohair

Added tag jdk7-b70 for changeset d36024aecf97

Added tag jdk7-b70 for changeset 207f694795c4

Merge

Merge

Merge

6870743: update comments in langtools/make/build.properties Reviewed-by: darcy

6870591: langtools build sets javac.bootclasspath incorrectly Reviewed-by: ohair

Merge

Merge

6803688: Integrate latest JAX-WS (2.1.6) in to JDK 6u14 Reviewed-by: darcy, ramap

6199153: Generic throws and overriding Summary: javac incorrectly rejects an uchecked overriding Reviewed-by: jjg

6569404: Cannot instantiate an inner class of a type variable Summary: javac is too strict in rejecting member selction from a type-var Reviewed-by: jjg

6869075: regression: javac crashes when compiling compound string assignment with generics Summary: javac should not add syntehtic cast to the LHS of an assignment expression Reviewed-by: jjg

6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference Summary: javac should warn/complain about identifiers with the same name as synthetic symbol Reviewed-by: jjg

6840059: regression: javac silently crashes when resolving erroneous anonymous inner constructor Summary: resolved an internal crash with constructor resolution Reviewed-by: jjg

6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5 Summary: javac needs to synthetize a fake java.lang.Void symbol if one is not given on the classpath Reviewed-by: jjg

6806876: ClassCastException occurs in assignment expressions without any heap pollutions Summary: intersection types should be considered as non-reifiable by javac Reviewed-by: jjg

6868539: javap should use current names for constant pool tags Reviewed-by: ksrini

6868548: remove spurious ';' from after constant pool entries Reviewed-by: ksrini

Merge

6858429: javap classfile library a minor bug Reviewed-by: ksrini

Merge

6729471: javap should accept class files on the command line Reviewed-by: mcimadamore

6868553: 6867671 breaks some tests Reviewed-by: mcimadamore

6867671: javap whitespace formatting issues Reviewed-by: mcimadamore

Merge

4880672: javap does not output inner interfaces of an interface Reviewed-by: mcimadamore

6866657: add byteLength method to primary classfile types Reviewed-by: mchung

6861837: JCK compilation failures Summary: Type-annotations processing is accessing type info before they are available in MemberEnter Reviewed-by: jjg Contributed-by: mali@csail.mit.edu

6864382: NPE in the rich formatter when processing an unattributed type-variable Summary: Unattributed type variable should not be accessed by the rich formatter when emitting where clauses Reviewed-by: jjg

6862608: rich diagnostic sometimes contain wrong type variable numbering Summary: The rich formatter generates worng numbers for type-variables in where clauses Reviewed-by: jjg

6827648: Extremely slow compilation time for visitor pattern code + generics Summary: Javac unnecessarily recomputates type-substitutions multiple times Reviewed-by: jjg