7021531: lock ordering problems after fix for 6354181 Reviewed-by: kvn, jrose

7016474: string compare intrinsic improvements Reviewed-by: kvn

7019819: bare oop in ciField Reviewed-by: kvn, iveresov

Merge

7018101: os::dll_address_to_function_name returning wrong answers in 64 bit Reviewed-by: acorn, kvn, dsamersoff

7018378: JSR 292: _bound_int_mh produces wrong result on 64-bit SPARC Reviewed-by: kvn

7018506: CTW swallowing OOMs after symbol changes Reviewed-by: kvn, iveresov, coleenp

7018673: Zero: 6953144, 6990754 and 7009756 made some changes which broke Zero Reviewed-by: kvn, chrisphi, twisti

7018849: 7017124 fix broke VM build on some platforms Summary: Use atomic load and store in inc_stat_counter() only on SPARC and X86. Reviewed-by: iveresov

7017746: Regression : C2 compiler crash due to SIGSEGV in PhaseCFG::schedule_early() Summary: Add TEMP edges (and KILL projections) before duplicated operands are removed in Expand() methods. Reviewed-by: never

7018277: JSR 292 change test/compiler/6987555/Test6987555.java to new MH syntax Summary: test/compiler/6987555/Test6987555.java currently does not compile because the MH return-type syntax has changed. Reviewed-by: never

7017434: Tiered needs to support reprofiling Summary: Tiered needs to support proper method reprofiling after deopts. Reviewed-by: kvn

7014874: Incorrect COOPs modes on solaris-{sparcv9,amd64} with ParallelGC Summary: Align old gen size down to keep specified heap size. Reviewed-by: ysr

7017124: Fix some VM stats to avoid 32-bit overflow Summary: Added new method inc_stat_counter() to increment long statistic values and use atomic long load and store. Reviewed-by: dholmes, jrose, phh, never

7013538: Java memory leak with escape analysis Summary: Don't allocate VectorSet iterator on C heap. Reuse resource storage in EA. Reviewed-by: never

7017240: C2: native memory leak in nsk/regression/b4675027 on windows-x86 in comp mode with G1 Summary: Add ResourceMark into PhaseIdealLoop::build_and_optimize(). Reviewed-by: never

7014998: assert(is_T_family(features) == is_niagara(features)) failed: Niagara should be T series Summary: Use substring search instead of compare and convert string to upper case before search. Reviewed-by: never, phh, iveresov

7012339: JSR 292 crash in G1SATBCardTableModRefBS::write_ref_field_pre_work() Reviewed-by: jrose, never

7009309: JSR 292: compiler/6991596/Test6991596.java crashes on fastdebug JDK7/b122 Reviewed-by: kvn, never

6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111" Reviewed-by: jrose, acorn

Merge

7019557: SharedMiscDataSize too small for 64-bit fastdebug JVM Summary: Increase default SharedMiscDataSize Reviewed-by: dcubed, kamg

Merge

7019689: Non-dependent name is found in dependent base class although it should be rejected Summary: fix hashtable.hpp to qualify non-dependant name with "this" Reviewed-by: phh, never, poonam Contributed-by: volker.simonis@gmail.com

6840152: JVM crashes when heavyweight monitors are used Summary: Turn off biased locking if !UseFastLocking or UseHeavyMonitors options are requested. Reviewed-by: phh, never, dcubed, dholmes

Merge

7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK Summary: Set JDK_IMPORT_PATH to ALT_JDK_TARGET_IMPORT_PATH if it is defined Reviewed-by: phh, ohair

6954420: 2/4 jps shows "process information unavailable" sometimes Summary: Make sure the backing store file is flushed in create_sharedmem_resources() and get_user_name_slow() no longer checks the size of the backing store file. Reviewed-by: briand, swamyv, acorn, poonam

Merge

7019157: errorHandler doesn't compile with super old gcc without precompiled headers Summary: old gccs don't support precompiled headers so have to supply includes Reviewed-by: phh, kamg

7017824: Add support for creating 64-bit Visual Studio projects Summary: Updated create.bat and ProjectCreator Reviewed-by: brutisso, stefank, ohair

Merge

Merge

7018257: jmm_DumpThreads allocates into permgen Summary: Don't allocate in permgen Reviewed-by: ysr, sla

7018302: newly added assert related to size of constantPoolOop causes secondary assertions or crashes Summary: 6912621 used a raw oop in the newly added assert following an allocation attempt that could result in a GC. Reviewed-by: jmasa

7017008: G1: Turn on compressed oops by default. Summary: Normally compressed oops is enabled when the maximum heap size is under a certain limit, except when G1 is also enabled. Remove this limitation. Also re-enable GCBasher testing with G1 on 64 bit windows in jprt. Reviewed-by: jcoomes, brutisso, tonyp

7014851: Remove unused parallel compaction code Summary: Removed. Reviewed-by: jcoomes, brutisso

6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?") Summary: Fix block_size_if_printezis_bits() so it does not expect the bits, only uses them when available. Fix block_size_no_stall() so it does not stall when the bits are missing such cases, letting the caller deal with zero size returns. Constant pool cache oops do not need to be unparsable or conc_unsafe after their klass pointer is installed. Some cosmetic clean-ups and some assertion checking for conc-usafety which, in the presence of class file redefinition, has no a-priori time boundedness, so all GCs must be able to safely deal with putatively conc-unsafe objects in a stop-world pause. Reviewed-by: jmasa, johnc

7015169: GC Cause not always set Summary: Sometimes the gc cause was not always set. This caused JStat to print the wrong information. Reviewed-by: tonyp, ysr Contributed-by: suenaga.yasumasa@oss.ntt.co.jp

7022659: errorHandler doesn't compile without precompiled headers Summary: add proper includes in errorHandler.hpp Reviewed-by: phh, kamg

Added tag hs21-b02 for changeset 70ed6d8368bc

Added tag jdk7-b131 for changeset e0205cb94879

Added tag jdk7-b131 for changeset 836de2e4bdee

Added tag jdk7-b131 for changeset d8af56da89bc

Merge

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 09e47b898040

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 1607780fe197

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset b0a4325b9ef5

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg