Merge

6912063: inlining parameters need to be adjusted for some uses of the JVM Summary: Put all inline-related switches into product mode, to allow tuning by dynamic language implementors. Reviewed-by: twisti, kvn

Merge

6912062: disassembler plugin needs to produce symbolic information in product mode Summary: More informative disassembly in product mode. Also, a more consistent CompileCommand syntax. Reviewed-by: never

6910484: incorrect integer optimization (loosing and op-r in a given example) Summary: Remove AND operation only if mask is equal to shift. Reviewed-by: never

6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp Summary: Check RootNode before check Loop in IfNode::up_one_dom(). Reviewed-by: never Contributed-by: kevin.brown@sun.com

6914206: change way of permission checking for generated MethodHandle adapters Summary: Put generated MH adapter in InvokeDynamic/MethodHandle classes to be able to indentify them easily in the compiler. Reviewed-by: kvn, never, jrose

6912517: JIT bug compiles out (and stops running) code that needs to be run. Causes NPE. Summary: Add missing check that value is used in memory expression in instructions with embedded load. Reviewed-by: never, jrose

6914622: Print values of all flags for product VM Summary: Change the flag -XX:+PrintFlagsFinal to product and add new product flag -XX:+PrintFlagsInitial. Reviewed-by: phh, ysr Contributed-by: gbenson@redhat.com

Merge

6912018: CMS: guarantee(head() != 0,"The head of the list cannot be NULL") Summary: Block too small to split was not correctly putback to free lists. Reviewed-by: ysr

6637203: Classunloading messages go to stdout rather than Xloggc file, causing hangs when stdout is closed Summary: Decoupled TraceClassUnloading from verbose:gc, JVMTI_VERBOSE_GC and PrintGC[Details], making it settable in a manner identical to TraceClassLoading. Reverted an inadvertent change of TraceClassUnloading output in a previous changeset from gclog back to tty. Reviewed-by: coleenp, dholmes, jmasa, poonam

Merge

6631166: CMS: better heuristics when combatting fragmentation Summary: Autonomic per-worker free block cache sizing, tunable coalition policies, fixes to per-size block statistics, retuned gain and bandwidth of some feedback loop filters to allow quicker reactivity to abrupt changes in ambient demand, and other heuristics to reduce fragmentation of the CMS old gen. Also tightened some assertions, including those related to locking. Reviewed-by: jmasa

Merge

Merge

6914300: ciEnv should export all well known classes Reviewed-by: kvn, twisti

6914002: unsigned compare problem after 5057818 Reviewed-by: kvn, twisti

Merge

6908267: Zero fails to unlock synchronized native methods on exception Reviewed-by: never Contributed-by: Gary Benson <gbenson@redhat.com>

6893268: additional dynamic language related optimizations in C2 Summary: C2 needs some additional optimizations to be able to handle MethodHandle invokes and invokedynamic instructions at the best performance. Reviewed-by: kvn, never

6829187: compiler optimizations required for JSR 292 Summary: C2 implementation for invokedynamic support. Reviewed-by: kvn, never

6913075: EA identifies escape state incorrectly after 6895383 fix Summary: EA incorrectly identifies escape state of an allocation passed as call argument. Reviewed-by: never

6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164) Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately. Reviewed-by: kvn, never

Merge

6894206: JVM needs a way to traverse method handle structures Summary: We need a way to walk chained method handles in the JVM to call the right methods and to generate required bytecode adapters for the compilers. Reviewed-by: kvn

6913869: Zero assert fix Summary: Zero currently won't build on zSeries or PowerPC machines with assertions turned on. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6909153: Fix broken options on Zero Summary: Smaller fixes to ensure that Zero still works with non-standard options. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

Added tag jdk7-b79 for changeset 9b63533d5895

Merge

6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION Summary: Only turn off documentation for updates when not building OpenJDK Reviewed-by: ohair

Added tag jdk7-b79 for changeset 142aec7359d5

Added tag jdk7-b79 for changeset e9c98378f6b9

Merge

Merge

Merge

6911854: Update TestElementsAnnotatedWith.java to use @compile/proc Reviewed-by: jjg

6910317: [classfile] typo and other issues in Dependency classes Reviewed-by: ksrini

6907575: [classfile] add support for classfile dependency analysis Reviewed-by: ksrini

6906175: bridge JSR199 and JSR 203 APIs Reviewed-by: darcy, alanb

6909538: Clarify meaning of "element" in javax.lang.model.element API Reviewed-by: ahe

Added tag jdk7-b78 for changeset fcbbd4d49581

Merge

Added tag jdk7-b78 for changeset f6cdb0710f97

Merge

Added tag jdk7-b78 for changeset 977f877abc78

Merge

Added tag jdk7-b78 for changeset 185d9f127780

Merge

Merge

6914665: update jdk code for JSR 292 (post 6858164) Summary: Fill in missing API implementations, fix numerous bugs, adjust APIs towards EG design. Reviewed-by: twisti

Merge

6891770: JSR 292 API needs initial unit tests Summary: backport working mlvm regression test to M3 implementation of JSR 292; requires jtreg 4.1 Reviewed-by: twisti

6913636: kvno check in JSSE Reviewed-by: valeriep

6895424: RFC 5653 Reviewed-by: valeriep

6907425: JCK Kerberos tests fail since b77 Reviewed-by: valeriep

6843127: krb5 should not try to access unavailable kdc too often Reviewed-by: valeriep, mullan

6908348: java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java get OOME for unbounded queues Reviewed-by: martin, dholmes

6912893: (build) make/java/nio/FILES_java.gmk doesn't list sun.nio.cs.Unicode Summary: Add missing Java source file Reviewed-by: alanb

6912628: test/java/util/jar/JarFile/TurkCert.java cannot be run in samevm mode Summary: Added tag to run this test in othervm Reviewed-by: chegar

6908541: Bad resource management in java/math/BigInteger/BigIntegerTest.java Reviewed-by: alanb

Merge

6909573: Temporary launcher support to add modules in the bootclasspath Summary: Add the list of modules to the bootclasspath if lib/rt.jar and classes don't exist Reviewed-by: alanb, ohair, ksrini

6909572: Add a new target for building modules Summary: Add a new "modules" build target that builds jdk and jre module image Reviewed-by: alanb, ohair

Merge

6898747: Allow JNDI cosnaming provider to be used when java.applet is not present Summary: Check if java.applet.Applet is present before accessing the type Reviewed-by: alanb, vinnie

6558110: tmp/java/jli/obj_g/static is not deleted automatically Reviewed-by: ksrini

6908131: Pure Java implementations of StrictMath.floor(double) & StrictMath.ceil(double) Reviewed-by: alanb

Merge

Merge

6909373: Add -ea to the testing done by jdk/test/Makefile Reviewed-by: darcy

Merge

Merge

6906210: Fix another minor typo in test/Makefile Reviewed-by: tbell, dcubed

6909442: Fix comments in test/sun/tools/jhat/HatRun.java Summary: Update the comments in this test to match the changes in 6902325 Reviewed-by: ohair

6909563: Javadoc build warnings in rmi, security, management Reviewed-by: mchung, mullan

4891262: API spec, javax/accessibility: few invalid javadoc tags Reviewed-by: jjg

6909070: Missing package statements in java.text.Bidi @see links Reviewed-by: anthony

Merge

6909089: Memory leak occurs by lack of free for read buffer in SocketInputStream#read() Reviewed-by: alanb, jccollet

Merge

6867348: Digest Value of References inside Manifest - calculation order problem Reviewed-by: xuelei

6909082: Docs warning from java.util.logging.PlatformLoggingMXBean Summary: Fix incorrect tag @See with @see. Reviewed-by: darcy

6909057: @see Arrays#hashCode missing particular method specification in j.u.Objects.hash Reviewed-by: ksrini

6908628: ObjectIdentifier s11n test fails Reviewed-by: xuelei

6903754: (bf) Improve floating-point buffer comparison Summary: Describe the exact behavior of {Double,Float}Buffer.{equals,compareTo}; fix non-anti-symmetric behavior of compareTo Reviewed-by: alanb Contributed-by: jessewilson@google.com

Added tag jdk7-b78 for changeset 97c33ee30c4f

Merge

Merge

Merge

Merge

6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build Reviewed-by: dholmes, acorn, jrose

Merge

6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build Reviewed-by: kvn, never, dholmes, ysr

6843629: Make current hotspot build part of jdk5 control build Summary: Source changes for older compilers plus makefile changes. Reviewed-by: xlu

Merge

6849968: 3/2 JVMTI tests fails on jdk5.0 with hs14 Summary: If a JVMTI agent asks for version 1.0, then it should get version 1.0 semantics. Reviewed-by: dholmes, ohair

6648438: 4/4 src/share/vm/prims/jvmtiEnv.cpp:457 assert(phase == JVMTI_PHASE_LIVE,"sanity check") Summary: Return error on invalid JVMTI_PHASE instead of asserting. Reviewed-by: dholmes, ohair

6361589: Print out stack trace for target thread of GC crash Summary: If GC crashed with java thread involved, print out the java stack trace in error report Reviewed-by: never, ysr, coleenp, dholmes

Merge

6822370: ReentrantReadWriteLock: threads hung when there are no threads holding onto the lock (Netra x4450) Summary: This day one bug is caused by missing memory barriers in various Parker::park() paths that can result in lost wakeups and hangs. Reviewed-by: dice, acorn

Merge

6888880: JKernel VM to inject the sun.jkernel.DownloadManager as a boot classloader hook Summary: Call sun.jkernel.DownloadManager.setBootClassLoaderHook during the kernel VM initialization Reviewed-by: alanb, coleenp, acorn

Merge

Merge

Merge

6862387: tune concurrent refinement further Summary: Reworked the concurrent refinement: threads activation, feedback-based threshold adjustment, other miscellaneous fixes. Reviewed-by: apetrusenko, tonyp

Merge

5057818: codecache full and compiler disabled in bigapps fastdebug run Reviewed-by: kvn

6829192: JSR 292 needs to support 64-bit x86 Summary: changes for method handles and invokedynamic Reviewed-by: kvn

6912782: Bump the HS17 build number to 06 Summary: Update the HS17 build number to 06 Reviewed-by: jcoomes

Merge

Merge

Merge

6908215: G1: SEGV with G1PolicyVerbose=2 debug flag Summary: Change CollectionSetChooser::printSortedHeapRegions to handle null entries in _markedRegions growable array. Reviewed-by: jmasa, tonyp, iveresov

Merge

6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys Summary: Move instance store's memory users to corresponding memory slices when updating its memory edge. Reviewed-by: never

6895383: JCK test throws NPE for method compiled with Escape Analysis Summary: Add missing checks for MemBar nodes in EA. Reviewed-by: never

6908167: jbb2005, OptimizeStringConcat causes assert in EA Reviewed-by: kvn

Merge

Merge

Merge

6908208: UseCompressedOops: array_size() returns incorrect size for MAX_INT object array following 6906727 Summary: In array_size() cast to an unsigned to avoid overflow of intermediate value. Reviewed-by: kvn, tonyp, jmasa, jcoomes, coleenp

6904967: G1: some CollectionUsageThreshold tests fail Summary: ensure that max and committed are non-zero (currently: at least as large as the region size). Reviewed-by: iveresov, mchung

6906565: G1: deal with compilation warning in g1MemoryPool.hpp Summary: size_t max_size() hides size_t max_size() const. Reviewed-by: jmasa, ysr

6880903: G1: G1 reports incorrect Runtime.maxMemory() Summary: G1 reports committed memory instead of reserved memory from the Runtime.maxMemory() method Reviewed-by: ysr, jmasa

6906727: UseCompressedOops: some card-marking fixes related to object arrays Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17). Reviewed-by: kvn, coleenp, jmasa

6899058: G1: Internal error in ptrQueue.cpp:201 in nightly tests Summary: Fixes a race on the dirty card queue completed buffer list between worker thread(s) performing a flush of a deferred store barrier (enqueueing a newly completed buffer) and worker thread(s) in the RSet updating code claiming completed buffers. Removed the routine that removes elements from the completed update buffer queue using a CAS. Reviewed-by: ysr, tonyp

6815790: G1: Missing MemoryPoolMXBeans with -XX:+UseG1GC Summary: It introduces the necessary memory pools for G1. Reviewed-by: mchung, ysr

6902303: G1: ScavengeALot should cause an incremental, rather than a full, collection Summary: ScavengeALot now causes an incremental (but possibly partially young, in the G1 sense) collection. Some such collections may be abandoned on account of MMU specs. Band-aided a native leak associated with abandoned pauses, as well as an MMU tracker overflow related to frequent scavenge events in the face of a large MMU denominator interval; the latter is protected by a product flag that defaults to false. Reviewed-by: tonyp

6902701: G1: protect debugging code related to 6898948 with a debug flag Summary: Protected stats dump with a new develop flag; other than for the dump, reconciled product and non-product behaviour in face of the error. Reviewed-by: tonyp

6898948: G1: forensic instrumentation for out-of-bounds recent_avg_pause_time_ratio() Summary: Added instrumentation and (temporary) assert in non-product mode; clipped the value when found out-of-bounds in product mode. Fix of original issue will follow collection of data from this instrumentation. Reviewed-by: jcoomes, tonyp

6898857: [Regression] -XX:NewRatio with -XX:+UseConcMarkSweepGC causes fatal error Summary: Use CollectorPolicy information instead of MaxNewSize Reviewed-by: ysr, jcoomes

6895788: G1: SATB and update buffer allocation code allocates too much space Summary: The type in the NEW_C_HEAP_ARRRY and FREE_C_HEAP_ARRAY calls in the buffer allocation code was changed from void* to char as the size argument had already been mulitipled by the byte size of an object pointer. Reviewed-by: ysr, tonyp

6901572: JVM 1.6.16 crash on loops: assert(has_node(i),"") Summary: Skip the secondary induction variable handling if it is dead Reviewed-by: never, kvn

Merge

6904191: OptimizeStringConcat should be product instead of experimental Summary: Make OptimizeStringConcat a product VM option(contributed by never) Reviewed-by: never

6892658: C2 should optimize some stringbuilder patterns Reviewed-by: kvn, twisti

Merge

6896043: first round of zero fixes Reviewed-by: kvn Contributed-by: Gary Benson <gbenson@redhat.com>

Merge

Merge

6893504: LinkageError for bootstrap duplicate class definitions. Reviewed-by: kamg, xlu

6900899: vm fails to start when -Xmx value is less than OldSize + NewSize Summary: Set minimum heap size to min(OldSize + NewSize, MaxHeapSize) in Arguments::set_heap_size(). Reviewed-by: kvn, ysr, tonyp

Merge

6902036: WorldWind asserts on escape.cpp:1153: assert(addr->is_AddP(),"AddP required") Summary: Remove the assert. Reviewed-by: twisti

6902000: use ShouldNotReachHere() for btos/ctos/stos in TemplateInterpreterGenerator::set_short_entry_points Summary: set_entry_point is only ever used with the tos states of bytecode templates in templateTable.cpp and none of those use the subword tos states like btos, ctos and stos. Reviewed-by: kvn

6892079: live value must not be garbage failure after fix for 6854812 Reviewed-by: kvn

Merge

Merge

6898160: Need serviceability support for new vm argument type 'uint64_t' Summary: Add serviceability support for uint64_t. Flags of unknown type assert in debug builds and are ignored in product builds. Reviewed-by: never, xlu, mchung, dcubed

Merge

Merge

6887571: Increase default heap config sizes Summary: Apply modification of existing server heap size ergo to all collectors except CMS. Reviewed-by: jmasa, ysr, xlu

Merge

6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155 Summary: Always call C->get_alias_index(phase->type(address)) during parsing. Reviewed-by: never

6896370: CTW fails share/vm/opto/matcher.cpp:1475 "duplicating node that's already been matched" Summary: Move DecodeN code outside the memory nodes only code. Reviewed-by: never

6769124: various 64-bit fixes for c1 Reviewed-by: never

6858164: invokedynamic code needs some cleanup (post-6655638) Summary: Fix several crashers, remove needless paths for boxed-style bootstrap method call, refactor & simplify APIs for rewriter constantPoolOop, remove sun.dyn.CallSiteImpl Reviewed-by: kvn

6852078: HSX 14/16 in jdk 5.0: api/javax_management api/org_omg jck tests crashes or make tnameserv crash Summary: Disable SuperWord optimization for unsafe read/write Reviewed-by: kvn, phh

6896084: VM does not reserve protected page below heap for compressed oops implicit null checks Summary: Set narrow_oop_base and narrow_oop_use_implicit_null_checks in Universe::preferred_heap_base(). Reviewed-by: twisti, jcoomes

Added tag jdk7-b78 for changeset c60317f0dfe6

Added tag jdk7-b78 for changeset 2325bc76b570

Added tag jdk7-b78 for changeset 4061c66ba1af

Merge

Merge

Merge

6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick <jesse.glick@sun.com>

Merge

6907660: stupid typo in ZipFileIndex guarantees NPE Reviewed-by: darcy

6906748: Project Coin: Minor strings in switch cleanup Reviewed-by: jjg

Merge

6902337: fix langtools build to allow forward refs into jdk/ repo Reviewed-by: ohair, mcimadamore

6903456: 6898585 drops javadoc doclet.xml from JDK Reviewed-by: ohair

6902720: javac pretty printer does not handle enums correctly Reviewed-by: mcimadamore

6900511: javac command line help broken Reviewed-by: ksrini

6902264: fix indentation of tableswitch and lookupswitch Reviewed-by: ksrini

6898585: restructure langtools build.xml to facilitate more options for <build-classes> macro Reviewed-by: ohair

Added tag jdk7-b77 for changeset 2edda439128d

Merge

6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick <jesse.glick@sun.com>

Added tag jdk7-b77 for changeset 8b1d8a20852f

Merge

6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick <jesse.glick@sun.com>

Added tag jdk7-b77 for changeset d396d3706e0b

Merge

6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick <jesse.glick@sun.com>

Added tag jdk7-b77 for changeset a9713976af74

Merge

Merge

6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick <jesse.glick@sun.com>

Merge