6936366: Fork HS17 to HS18 - renumber Major and build numbers of JVM Summary: Update the Major and build numbers for HS18 fork Reviewed-by: jcoomes

Merge

Merge

6932091: JSR 292 x86 code cleanup Summary: Some code cleanups found during the JSR 292 SPARC port. Reviewed-by: kvn, never

6930043: C2: SIGSEGV in javasoft.sqe.tests.lang.arr017.arr01702.arr01702.loop_forw(II)I Reviewed-by: kvn

6935535: String.indexOf() returns incorrect result on x86 with SSE4.2 Summary: Added missing counter decrement when substring search restarted. Reviewed-by: twisti

6934966: JSR 292 add C1 logic for saved SP over MethodHandle calls Summary: The logic for x86 C1 to save the SP over MH calls is pretty straight forward but SPARC handles that differently. Reviewed-by: never, jrose

6935466: new CodeCache flushing code is not guarded by the flag Summary: Add missing guard. Reviewed-by: never

6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob Summary: Passing a null pointer to an InvokeDynamic function call should lead to a NullPointerException. Reviewed-by: kvn, never

6934089: Zero 32-bit/64kb page fix Summary: The fix for 6927165 increased the number of shadow pages for 32-bit platforms and this causes a problem on systems with 64kb pages. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6932496: c1: deoptimization of jsr subroutine fails on sparcv9 Summary: store jsr ret bci as intptr constant in c1 debug info Reviewed-by: never

Merge

6919934: JSR 292 needs to support x86 C1 Summary: This implements JSR 292 support for C1 x86. Reviewed-by: never, jrose, kvn

6932270: Allow Java's ELF symtab reader to use separate debuginfo files Reviewed-by: never Contributed-by: Andrew Haley <aph@redhat.com>

6932536: JSR 292 modified JDK MethodHandlesTest fails on x86_64 Summary: A modified MethodHandlesTest revealed two bugs on x86_64. Reviewed-by: never, jrose

Merge

6933402: RFE: Improve PrintSafepointStatistics output to track cleanup time Summary: Improve the usability of safepoint statistics data. See bug evaluation for more details. Reviewed-by: ysr, dholmes

6914050: jvm assertion "guard pages must be in use" in -Xcomp mode Summary: Move creating stack guard pages in jni attach thread before potential java call rather than after. Also cleanup stack guard pages when jni attach fails Reviewed-by: never, dholmes

6910182: CMS: assert(_cursor[j] == _survivor_plab_array[j].end(),"Ctl pt invariant") Summary: Calculation of the slicing of survivor spaces for MT was incorrect. Reviewed-by: ysr

Merge

6923123: Hotspot refuses to start when -Xmx4m or -Xms4m is specified Summary: Reduce NewSize from 4m to 1m. Reviewed-by: tonyp, jmasa

Merge

6928065: G1: use existing command line parameters to set the young generation size Summary: see synopsis Reviewed-by: johnc, jmasa

6928081: G1: rename parameters common with CMS Summary: Rename marking stack sizing flags to be common between G1 and CMS Reviewed-by: ysr, tonyp

6928073: G1: use existing command line parameters for marking cycle initiation Summary: replace the combination of the G1SteadyStateUsed / G1SteadyStateUsedDelta parameteres to decide the marking initiation threshold and instead use InitiatingHeapOccupancyPercent. Reviewed-by: ysr, johnc

6928059: G1: command line parameter renaming Summary: Rename G1 parameters to make them more consistent. Reviewed-by: jmasa, johnc

6930398: fix for return address locals in OSR entries uses wrong test Reviewed-by: kvn

6930116: loop predication code does not handle If nodes with only one projection Summary: Add check for iff->outcnt() < 2. Reviewed-by: never

6930035: C2 type system incorrectly handles case j.l.Object->meet(constant AryPtr) Summary: Add missing code. Reviewed-by: never

6915557: assert(_gvn.type(l)->higher_equal(type),"must constrain OSR typestate") with debug build Reviewed-by: kvn

6928839: JSR 292 typo in x86 _adapter_check_cast Summary: There is a small typo in methodHandles_x86.cpp. Reviewed-by: kvn

6928717: HS17 fails to build with SS11 C++ Summary: Add missing handles.inline.hpp for codeCache.cpp. Reviewed-by: never

6927049: assert(is_Loop(),"invalid node class") Reviewed-by: kvn

6910664: C2: java/util/Arrays/Sorting.java fails with DeoptimizeALot flag Summary: Matcher::float_in_double should be true only when FPU is used for floats. Reviewed-by: never, twisti

6663854: assert(n != __null,"Bad immediate dominator info.") in C2 with -Xcomp Reviewed-by: kvn

Added tag jdk7-b86 for changeset 16a26e16c83f

Added tag jdk7-b86 for changeset 41627c4e030e

Added tag jdk7-b86 for changeset c94d9cc81f49

Merge

Merge

Merge

Merge

6930108: IllegalArgumentException in AbstractDiagnosticFormatter for tools/javac/api/TestJavacTaskScanner.jav Reviewed-by: darcy

Merge

6931126: jtreg tests not Windows friendly Reviewed-by: darcy

6931927: position issues with synthesized anonymous class Reviewed-by: darcy

6449781: TypeElement.getQualifiedName for anonymous classes returns null instead of an empty name Reviewed-by: jjg

6931127: strange test class files Reviewed-by: darcy

6931482: minor findbugs fixes Reviewed-by: darcy

6931130: Remove unused AnnotationCollector code from JavacProcessingEnvironment Reviewed-by: jjg

6930032: fix findbugs errors in com.sun.tools.javac.comp Reviewed-by: darcy

6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file Reviewed-by: darcy

6881645: Unchecked method call on a method declared inside anonymous inner causes javac to crash Reviewed-by: mcimadamore

6893943: exit code from javah with no args is 0 Reviewed-by: darcy

6929544: langtools source code uses statics qualified by instance variables Reviewed-by: darcy

6929645: Address various findbugs warnings in langtools Reviewed-by: jjg

4880220: Add a warning when accessing a static method via an reference Reviewed-by: darcy

6511613: javac unexpectedly doesn't fail in some cases if an annotation processor specified Reviewed-by: darcy

Added tag jdk7-b85 for changeset 6830a7ec21d0

Merge

Added tag jdk7-b85 for changeset 58d57db8348f

Merge

Added tag jdk7-b85 for changeset cdc37d7f9bba

Merge

Added tag jdk7-b85 for changeset 3e4b803f1d22

Merge

Merge

6915983: testing problems, adjusting list of tests, needs some investigation Reviewed-by: alanb

Merge

6880321: sun.security.provider.JavaKeyStore abuse of OOM Exception handling Reviewed-by: xuelei

6923681: Jarsigner crashes during timestamping Reviewed-by: vinnie

6844909: support allow_weak_crypto in krb5.conf Reviewed-by: valeriep

6931763: sanity checks broken with latest cygwin, newer egrep -i option problems Reviewed-by: jjg

6931216: TEST_BUG: test/java/nio/file/WatchService/LotsOfEvents.java failed with NPE Reviewed-by: chegar

Merge

6921001: api/java_security/IdentityScope/IdentityScopeTests.html#getSystemScope fails starting from b78 JDK7 Reviewed-by: mullan

6921374: java.lang.String::hashCode() should check for count == 0 to avoid repeated stores hash = 0 Reviewed-by: darcy, ohair

6815768: File.getxxxSpace() methods fail for very large file systems under 32bit Java Reviewed-by: ohair

6929259: Remove double spaces from Dual-pivot quicksort Reviewed-by: alanb Contributed-by: vladimir.yaroslavskiy@sun.com

6929532: (file) WatchService should avoid queuing new modify events when lots of files are changing Reviewed-by: alanb Contributed-by: sebastian.sickelmann@gmx.de

6916202: More cases of invalid ldap filters accepted and processed Reviewed-by: vinnie, weijun

6929382: Various core classes in util and elsewhere are missing @param <T> tags Reviewed-by: dholmes, martin

6926800: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with newer versions of find(1) Reviewed-by: forax

6928960: make modules fails to build class analyzer Reviewed-by: mchung

6925932: (file) Path.endsWith can throw ArrayIndexOutOfBoundsException (unx) Reviewed-by: chegar

6925977: (file) test/java/nio/file/Path/CheckPermissions.java fails if test.src on read-only file system Reviewed-by: chegar

Merge

Merge

Merge

6921644: XMLEncoder generates invalid XML Reviewed-by: peterz

6917744: JScrollPane Page Up/Down keys do not handle correctly html tables with different cells contents Reviewed-by: peterz, alexp

6913768: With default SynthLookAndFeel instance installed new JTable creation leads to throwing NPE Reviewed-by: peterz

6924059: SynthScrollBarUI.configureScrollBarColors() should have spec different from the overridden method Reviewed-by: peterz

6929298: The SynthSliderUI#calculateTickRect method should be removed Reviewed-by: peterz

6923305: SynthSliderUI paints the slider track when the slider's "paintTrack" property is set to false Reviewed-by: alexp

6918861: SynthSliderUI.uninstallDefaults() is not called when UI is uninstalled Reviewed-by: malenkov

6918447: SynthToolBarUI.setBorderToXXXX() methods don't correspond inherited spec. They do nothing. Reviewed-by: peterz

6913758: Specification for SynthViewportUI.paintBorder(...) should mention that this method is never called Reviewed-by: peterz

4498236: RFE: Provide a toString method for PropertyChangeEvent and other classes Reviewed-by: peterz

6921289: (tz) Support tzdata2010b Reviewed-by: okutsu

6909002: Remove indicim.jar and thaiim.jar from JRE and move to samples if needed Reviewed-by: okutsu

6848475: JSlider does not display the correct value of its BoundedRangeModel Reviewed-by: peterz

Merge

6918065: Crash in Java2D blit loop (IntArgbToIntArgbPreSrcOverMaskBlit) in 64bit mode Reviewed-by: igor, bae

6892485: Deadlock in SunGraphicsEnvironment / FontManager Summary: Synchronize on correct monitor in SunFontManager. Reviewed-by: igor, prr

Added tag jdk7-b85 for changeset 5751e91f963a

Merge

Added tag hs17-b10 for changeset bd3cc6d99492

Added tag jdk7-b85 for changeset 448969041d3d

Merge

Merge

6928700: Configure top repo for JPRT testing Reviewed-by: alanb, jjg

Added tag jdk7-b85 for changeset 13d8d7dd8b00

Added tag jdk7-b85 for changeset b6f633a93ae0

Merge

Merge

Merge

6928623: Behaviour of VERBOSE=true on langtools build Summary: VERBOSE=true causes -diagnostics to be passed to ant rather than -debug Reviewed-by: jjg

6927797: langtools/test/tools/javac/EarlyAssert.java fails when run with assertions enabled (-ea) Reviewed-by: darcy

Merge

Merge

6927061: Refactor apt implemenation to use code from JSR 269 Reviewed-by: jjg

6926703: apt tests should run with assertions enabled Reviewed-by: jjg

6926699: Annotation processing regression tests should typically return SourceVersion.latest Reviewed-by: jjg

6634138: Source generated in last round not compiled Reviewed-by: jjg

6926555: 6921979 breaks TreePosTest Reviewed-by: darcy

Added tag jdk7-b84 for changeset ae856f7b6776

Merge