6990549: Zero and Shark fixes after 6978355 and 6953144 Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6980792: Crash "exception happened outside interpreter, nmethods and vtable stubs (1)" Reviewed-by: kvn

Merge

6980838: G1: guarantee(false) failed: thread has an unexpected active value in its SATB queue Summary: Under certain circumstances a safepoint could happen between a JavaThread object being created and that object being added to the Java threads list. This could cause the active field of that thread's SATB queue to get out-of-sync with respect to the other Java threads. The solution is to activate the SATB queue, when necessary, before adding the thread to the Java threads list, not when the JavaThread object is created. The changeset also includes a small fix to rename the surrogate locker thread from "Surrogate Locker Thread (CMS)" to "Surrogate Locker Thread (Concurrent GC)" since it's also used in G1. Reviewed-by: iveresov, ysr, johnc, jcoomes

Merge

6983311: G1: LoopTest hangs when run with -XX:+ExplicitInvokesConcurrent Summary: Clear the concurrent marking "in progress" flag while the FullGCCount_lock is held. This avoids a race that can cause back to back System.gc() calls, when ExplicitGCInvokesConcurrent is enabled, to fail to initiate a marking cycle causing the requesting thread to hang. Reviewed-by: tonyp, ysr

6794422: Perm gen expansion policy for concurrent collectors Summary: Concurrent collectors should expand the perm gen without a full STW GC, but possibly by triggering a concurrent collection. Temporary band-aid for G1 where no concurrent collection is kicked off since the perm gen is not collected concurrently. Reviewed-by: johnc

6988678: fatal error deadlock handling was unintentionally disabled Reviewed-by: ysr

6692906: CMS: parallel concurrent marking may be prone to hanging or stalling mutators for periods of time Summary: Inserted missing yield(check)s in closures used during the work-stealing phase of parallel concurrent marking, a missing synchronous yield-request in the cms perm gen allocation path, and a terminator-terminator for the offer_termination invocation that monitors the yield status of the concurrent marking task. Elaborated some documentation comments and made some task queue termination loop flags configurable at start-up to aid debugging in the field. Reviewed-by: jmasa, johnc, poonam

6423256: GC stacks should use a better data structure 6942771: SEGV in ParScanThreadState::take_from_overflow_stack Reviewed-by: apetrusenko, ysr, pbk

6941395: G1: Use only lock-free versions of region stack push() and pop() Summary: Re-enable use of the lock-free versions of region stack push() and pop() by recording aborted regions in a thread-local structure, which are then processed when scanning of the region stack restarts. The previous locking versions of these routines are retained for diagnostic purposes. Reviewed-by: tonyp, ysr

6983296: build sanity checks for jdk7 should require SS12u1 Reviewed-by: ohair

6984287: Regularize how GC parallel workers are specified. Summary: Associate number of GC workers with the workgang as opposed to the task. Reviewed-by: johnc, ysr

Merge

6989736: fix mapfile warnings on solaris Reviewed-by: kvn, iveresov, jcoomes

6988018: dtrace/hotspot/MethodInvocation/MethodInvocation002 crashes with client compiler Reviewed-by: iveresov, kvn, kamg

6979458: VM crashes when -XX:ObjectAlignmentInBytes is too big Summary: Set upper limit 256 for ObjectAlignmentInBytes value. Reviewed-by: never, iveresov

6989368: Regression in scimark2.MonteCarlo in jdk7_b112 on Linux Summary: Fix ciMethod::instructions_size() to return correct value Reviewed-by: kvn, twisti

6968348: Byteswapped memory access can point to wrong location after JIT Reviewed-by: twisti, kvn, iveresov

6916062: assert(_inserts <= _insert_limit,"hash table overflow") in NodeHash::hash_insert Summary: Missing check for not empty worklist when puting memory node back on worklist and expecting address type update. Reviewed-by: never

6988346: 6986046 breaks tiered Summary: adjusted profiling code generation to use the new ValueStack implementation; lowered optimization level for c1_LinearScan.cpp on solaris x64. Reviewed-by: kvn, never

6988303: 6986046 breaks build with recent gcc Summary: fixes build break Reviewed-by: never, kvn

6987634: JSR 292 assert(start_bci() >= 0 && start_bci() < code_size()) failed: correct osr_bci argument Reviewed-by: never, kvn

6987763: assert(kind() == EmptyExceptionState) failed: only EmptyExceptionStates can be modified Reviewed-by: roland, kvn, iveresov

6987115: Non-tiered compilation policy creates unnecessary C1 threads Summary: Fixed NonTieredCompPolicy::compiler_count() to return correct thread count. Reviewed-by: twisti, kvn

Merge

6986046: C1 valuestack cleanup Summary: fixes an historical oddity in C1 with inlining where all of the expression stacks are kept in the topmost ValueStack instead of being in their respective ValueStacks. Reviewed-by: never Contributed-by: Christian Wimmer <cwimmer@uci.edu>

6986944: JSR 292 assert(caller_nm->is_method_handle_return(caller_frame.pc())) failed: must be MH call site Reviewed-by: never, kvn

6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub Reviewed-by: kvn, twisti

6972540: sun/nio/ch/SocketChannelImpl compilation crashed when executing CompileTheWorld Reviewed-by: kvn

6982537: Crash in Node*step_through_mergemem Reviewed-by: kvn

6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails Summary: Propagate the compiler type of the deopting method to vframeArrayElement::unpack_on_stack() Reviewed-by: jrose, never

6984979: OptimizeFill misses some cases with an odd memory graph Reviewed-by: kvn

Added tag hs20-b01 for changeset 75ef8813e3e2

Added tag jdk7-b114 for changeset 21dec68c50e9

Merge

Merge

6983855: The jre combo bundle target needs to be added in the makefile Reviewed-by: billyh, paulk

Merge

6982520: Move kernel to install ws Reviewed-by: herrick, billyh

Merge

Merge

6978977: Productivity: use ant for java part of build Reviewed-by: mduigou, herrick, ohair, ngthomas

Added tag jdk7-b114 for changeset fec780096b1f

Added tag jdk7-b114 for changeset 750c1ccb2f2d

Merge

Merge

Merge

Merge

6907737: (file) FileVisitor and Files.walkFileTree issues Reviewed-by: jjg

6988436: Cleanup javac option handling Reviewed-by: darcy

6983738: Use a JavacTestingAbstractProcessor Reviewed-by: jjg

6502392: Invalid relative names for Filer.createResource and Filer.getResource Reviewed-by: darcy

6967842: Element not returned from tree API for ARM resource variables. Reviewed-by: jjg, darcy

6986246: Trees object is round-specific Reviewed-by: darcy

6877202: Elements.getDocComment() is not getting JavaDocComments 6861094: javac -Xprint <file> does not print comments 6985205: access to tree positions and doc comments may be lost across annotation processing rounds Reviewed-by: darcy

6890226: javah -version is broken Reviewed-by: darcy

Merge

6986772: langtools netbeans build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar Reviewed-by: ohair

6587674: NoClassdefFound when anonymously extending a class. Reviewed-by: jjg, mcimadamore

6863465: javac doesn't detect circular subclass dependencies via qualified names Summary: class inheritance circularity check should look at trees, not just symbols Reviewed-by: jjg

5088624: cannot find symbol message should be more intelligent Summary: Resolve.java should keep track of all candidates found during a method resolution sweep to generate more meaningful diagnostics Reviewed-by: jjg

6980862: too aggressive compiler optimization causes stale results of Types.implementation() Summary: use a scope counter in order to determine when/if the implementation cache entries are stale Reviewed-by: jjg

Added tag jdk7-b113 for changeset edcbadb1c4b3

Merge

Added tag jdk7-b113 for changeset 9d2d843d318f

Merge

Added tag jdk7-b113 for changeset 039713686e1c

Merge

Added tag jdk7-b113 for changeset c180f52ae197

Merge

Merge

6990846: Demo: NIO.2 filesystem provider for zip/jar archives Summary: The first drop of the zip filesystem provider, as a separate demo Reviewed-by: alanb

Merge

6989139: Address JDBC Findbugs where Number type Constructor are used Reviewed-by: ohair

6989190: SO_SNDBUF/SO_RCVBUF limits should only be checked when setsockopt fails (sol) Reviewed-by: chegar, michaelm

6907737: (file) FileVisitor and Files.walkFileTree issues Reviewed-by: sherman

Merge

6979526: (file) java/nio/file/FileStore/Basic.java fails if the same file system is mounted more than once Reviewed-by: kevinw, forax

6988993: Address Findbugs warnings for the use of String Constructor Reviewed-by: ohair

Merge

6988037: fileClose prints debug message is close fails Reviewed-by: kevinw, forax

6987461: Handle leak when enabling java.net.useSystemProxies Summary: Release the registry key handle if ProxyEnable is 0 Reviewed-by: michaelm

6988163: sun.security.util.Resources dup and a keytool doc typo Reviewed-by: xuelei

6987927: can't use -Dfile.encoding=Cp037 in net test Reviewed-by: chegar

Merge

6550798: Using InputStream.skip with ResponseCache will cause partial data to be cached Reviewed-by: chegar

6987638: javadoc update to RowSetProvider and Statement Reviewed-by: darcy, alanb

Merge

6986868: TEST failure: sun/security/tools/jarsigner/crl.sh Reviewed-by: ohair

6987114: Fix top level "test" Makefile logic, add jdk/make/Makefile test target 6987113: Remove SCCS logic from makefiles Reviewed-by: mchung

6987117: Add jprt test sets Reviewed-by: mchung

6984036: servicetag vendor rebranding issues Summary: Update product_vendor field to use java.vendor system property Reviewed-by: ohair

6982971: TEST failure: com/sun/security/sasl/ntlm/NTLMTest.java Reviewed-by: wetmore

Merge

6946527: rebranding system properties per Oracle Requirements (vendor) Summary: Changes from "Sun Microsystems, Inc." to "Oracle Corporation" in the java.vendor, java.specification.vendor and java.vendor.url Java system properties. Also change of Windows COMPANY file property from "Oracle" to "Oracle Corporation". Reviewed-by: lancea, flar