6953588: hotspot\src\share\vm\interpreter\bytecodes.cpp doesn't compile with VS2010 on AMD64 Reviewed-by: dcubed

Merge

Merge

Merge

6951923: some uses of fatal1 were missed by 6888954 Reviewed-by: jcoomes Contributed-by: Gary Benson <gbenson@redhat.com>

6951188: CMS: move PromotionInfo into its own file Summary: Moved PromotionInfo and friends into new files promotionInfo.{h,c}pp from their previous compactibleFreeListSpace.{h,c}pp home. Reviewed-by: apetrusenko

6919638: CMS: ExplicitGCInvokesConcurrent misinteracts with gc locker Summary: GC-locker induced concurrent full gc should be asynchronous; policy now controlled by a separate flag, which defaults to false. Reviewed-by: jmasa

Merge

6948537: CMS: BOT walkers observe out-of-thin-air zeros on sun4v sparc/CMT Summary: On sun4v/CMT avoid use of memset() in BOT updates so as to prevent concurrent BOT readers from seeing the phantom zeros arising from memset()'s use of BIS. Reviewed-by: jmasa, johnc, minqi, poonam, tonyp

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

Merge

Merge

6951784: Zero deoptimizer changes Summary: The way Zero currently handles deoptimization can lead to methods being freed while they are still being executed. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

Merge

6950617: Zero/Shark interface updates Summary: Zero needs a couple of new methods to allow Shark to access the new frame anchor field. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6950178: Zero stack improvements Summary: Moves the logic for determining the size of the Zero stack into the ZeroStack class. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6949830: 6939134 broke Zero Summary: The commit for 6939134 broke Zero. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6949423: remove tagged stack interpreter for Zero Summary: Missed Zero changes for 6943304. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6939196: method handle signatures off the boot class path get linkage errors Summary: Adjust MethodType lookup logic to search off the BCP, but not to cache those results Reviewed-by: twisti

6939134: JSR 292 adjustments to method handle invocation Summary: split MethodHandle.invoke into invokeExact and invokeGeneric; also clean up JVM-to-Java interfaces Reviewed-by: twisti

6943304: remove tagged stack interpreter Reviewed-by: coleenp, never, gbenson

6939182: Zero JNI handles fix Summary: Zero will exit with an error when invoked with -Xcheck:jni. Reviewed-by: twisti, kamg Contributed-by: Gary Benson <gbenson@redhat.com>

6948602: Disable use of SSE4.2 in String.indexOf intrinsic until 6942326 is fixed Summary: Disable the use of pcmpestri until it can be guaranteed that the load doesn't cross in to the uncommited space. See 6942326. Reviewed-by: never, kvn

6829193: JSR 292 needs to support SPARC Summary: There are unimplemented portions of the hotspot code for method handles and invokedynamic specific to SPARC. Reviewed-by: kvn, never, jrose

Merge

Merge

Merge

6949118: jvm.dll shows the company name as Sun Microsystems Summary: Changed to "Oracle Corporation" Reviewed-by: coleenp, dcubed

6935118: UseCompressedOops modification in methodOopDesc::sort_methods() causes JCK timeout Summary: Add comparison functions for compressed oops to use bubblesort. Reviewed-by: never, coleenp Contributed-by: volker.simonis@gmail.com

6944822: Fix for 6938627 exposes problem with hard-coded buffer sizes Summary: Make tmpdir buffer sizes MAX_PATH+1 Reviewed-by: dholmes, coleenp Contributed-by: andreas.kohn@fredhopper.com

6951190: assert(!klass_is_exact(),"only non-exact klass") while building JDK Reviewed-by: kvn

Added tag hs18-b04 for changeset 31ba466ddb99

Merge

Merge

6950438: Add 6u18 and 6u20 release values explicitly to jprt.properties file Summary: modify jprt.properties to allow JPRT to use 6u18 and 6u18 targets Reviewed-by: ohair

Merge

6888954: argument formatting for assert() and friends Reviewed-by: kvn, twisti, apetrusenko, never, dcubed

6888953: some calls to function-like macros are missing semicolons Reviewed-by: pbk, kvn

6946056: assert((intptr_t) sp()<=(intptr_t) result,"result must>=than stack pointer"), frame_x86.cpp:295 Summary: frame::interpreter_frame_monitor_end() will spuriously assert for a frame that spans 0x80000000. Cast values to intptr_t* (rather than intptr_t) so that an unsigned pointer compare is performed. Reviewed-by: never, jcoomes, pbk

Added tag jdk7-b93 for changeset 886a48579400

Merge

Merge

6903970: VS2008/VS2010 build fails in make/sun/jkernel because of "afxres.h" missing Reviewed-by: ohair, art

Added tag jdk7-b93 for changeset 30b170e85ca5

Added tag jdk7-b93 for changeset b5dab6a313fd

Merge

Merge

Added tag jdk7-b92 for changeset f6dc4589a315

Merge

Added tag jdk7-b92 for changeset dc292c44a947

Merge

Added tag jdk7-b92 for changeset 34f8f501f771

Merge

Merge

6931180: Migration to recent versions of MS Platform SDK Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010 Reviewed-by: ohair, art, ccheung, dcubed

Added tag jdk7-b92 for changeset e5dbe15cfee0

Merge

Merge

6931180: Migration to recent versions of MS Platform SDK 6944048: VS2010 build failure in make/com/sun/java/pack: missing unpack200.exe.manifest 6944015: VS2010 build failure in awt_TextArea.cpp: ambiguous call to abs() 6936319: JDK build fails in awt_DnDDS.cpp with Visual Studio 2008/Platform SDK 7 6944516: Windows L&F is broken in SwingSet2, when JDK is built with the recent Windows SDK Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010 Reviewed-by: ohair, art, ccheung, dcubed

Added tag jdk7-b92 for changeset d36af409752e

Merge

Merge

6931180: Migration to recent versions of MS Platform SDK 6951582: Build problems on win64 Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010 Reviewed-by: ohair, art, ccheung, dcubed

Added tag jdk7-b92 for changeset 8f63b4408306