Merge

6855834: G1: minimize the output when -XX:+PrintHeapAtGC is set Summary: Changing the behavior of -XX:+PrintHeapAtGC for G1 from printing lengthy, per-region information to instead printing a concise summary. Reviewed-by: ysr, apetrusenko, jcoomes

Merge

6857661: 64-bit server VM: assert(is_Initialize(),"invalid node class") Summary: Move the secondary raw memory barrier to the correct place in generate_arraycopy(). Reviewed-by: never

6857707: Add missing test case for CR 6855164 from its bug description. Summary: Add missing test case for CR 6855164 from its bug description. Reviewed-by: never

6855164: SIGSEGV during compilation of method involving loop over CharSequence. Summary: Don not split a block if it contains a FastLockNode with a PhiNode input. Reviewed-by: kvn, never

6840775: Multiple JVM crashes seen with 1.6.0_10 through 1.6.0_14 Summary: Put missed reference to allocated array in copyOf() intrinsic into OopMap for the call slow_arraycopy(). Reviewed-by: never

Merge

6855115: G1: Fix for 6850869 is incorrect Summary: Missed updating two variable names when improving the code for 6850869. Reviewed-by: iveresov, jmasa, ysr

6854027: Precompiled headers are not being updated in Linux/GCC builds Summary: Fixes incorrect handling of precompiled headers in diff mode. Reviewed-by: never, twisti

6850869: G1: RSet "scrubbing" scrubs too much Summary: RSet scrubbing incorrectly deletes RSet entries that point to regions tagged as "continues humongous" due to a race when RSet scrubbing iterates over regions in parallel. Reviewed-by: apetrusenko, iveresov

Merge

6856025: assert(_base >= OopPtr && _base <= KlassPtr,"Not a Java pointer") Reviewed-by: kvn

6851908: interpreter null check profiling broken causing extra compilation invalidation Reviewed-by: kvn

6818666: G1: Type lost in g1 pre-barrier Reviewed-by: kvn

5057225: Remove useless I2L conversions Summary: The optimizer should be told to normalize (AndL (ConvI2L x) 0xFF) to (ConvI2L (AndI x 0xFF)), and then the existing matcher rule will work for free. Reviewed-by: kvn

6841800: Incorrect boundary values behavior for option -XX:MaxLabelRootDepth=0-6 leads to jvm crash Summary: MaxLabelRootDepth value less then 10 is invalid. Reviewed-by: never

Merge

6851829: solaris build fails with 5.8 compilers Summary: Solaris builds with the CC 5.8 compilers (used for jdk6 update builds) fail while compiling adlc. Reviewed-by: never

6837094: False positive for "meet not symmetric" failure Summary: Have the meet not symmetric check recursively do the interface-vs-oop check on array subtypes. Reviewed-by: jrose Contributed-by: rasbold@google.com

6849574: VM crash using NonBlockingHashMap (high_scale_lib) Reviewed-by: kvn

6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14 Summary: Disable escape analysis when jvmti/debugger is used. Add support for EA ibto SA. Reviewed-by: never

6859411: Bump the HS16 build number to 06 Summary: Update the HS16 build number to 06 Reviewed-by: jcoomes

Added tag jdk7-b64 for changeset 4905b291b676

Merge

Merge

Merge

6853596: Update Build README-build.html with new info regarding update for Solaris 10u2 and BOOTDIR update Reviewed-by: tbell, ohair

Added tag jdk7-b64 for changeset 752e62a9e600

Added tag jdk7-b64 for changeset d22867c5f1b2

Merge

Merge

Merge

Merge

Merge

6844273: jdk/make/docs/CORE_PKGS.gmk does not list Nimbus Reviewed-by: prr

Merge

Merge

6855993: fix comments in langtools launcher script Reviewed-by: ohair

Merge

6855563: test broken after merge with latest parser Reviewed-by: jjg Contributed-by: mali@csail.mit.edu

6854796: update JSR308 impl with latest code from type-annotations repo Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6855544: add missing files Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6843077: JSR 308: Annotations on types Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6593082: MirroredTypeException constructor does not throw NPE when type is null Reviewed-by: jjg

Merge

Merge

6852649: The Rich formatter printer should be an explicit class to facilitate overriding Summary: Improve reusabiliy of the rich formatter by removing anonymous inner classes/changing visibility of fields Reviewed-by: jjg

6852595: Accessing scope using JSR199 API on erroneous tree causes Illegal Argument Exception Summary: Fixed problem with empty DiagnosticSource objects causing IAE in the JCDiagnostic constructor Reviewed-by: jjg

6822637: ResolveError hierarchy needs to be refactored Summary: Break ResolveError class into a hierarchy representing different kinds of resolution errors Reviewed-by: jjg

Merge

6852856: javap changes to facilitate subclassing javap for variants Reviewed-by: mcimadamore

6638712: Inference with wildcard types causes selection of inapplicable method Summary: Added global sanity check in order to make sure that return type inference does not violate bounds constraints Reviewed-by: jjg

6835428: regression: return-type inference rejects valid code Summary: Redundant subtyping test during type-inference ends up in rejecting legal code Reviewed-by: jjg

6835430: javac does not generate signature attributes for classes extending parameterized inner classes Summary: ClassWriter does not consider outer params of an inner class when emitting signature attributes Reviewed-by: jjg

6845686: basic and raw formatters do not display captured var id properly when javac runs in -XDoldDiags mode Summary: Basic and raw formatters do not override Printer methods properly Reviewed-by: jjg

Added tag jdk7-b63 for changeset 128e22c119ee

Merge

Added tag jdk7-b63 for changeset 7f19175c3da7

Merge

Added tag jdk7-b63 for changeset 602c27ff78bc

Merge

Merge

Merge