changeset 1557:c418a9f5c0bc

Merge
author andrew
date Tue, 18 May 2010 22:40:03 +0100
parents 091d102d001e e776591addb0
children 85229f14dcd9
files .hgtags make/hotspot_version src/share/vm/opto/library_call.cpp
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue May 18 20:45:28 2010 +0100
+++ b/.hgtags	Tue May 18 22:40:03 2010 +0100
@@ -110,3 +110,6 @@
 23decd59cae719a69aa18049511010b9df287025 hs17-b11
 bc7a1618e0994c79552a525db815c66c5c47cf40 hs17-b12
 8ca546927f8cacf67f6e3f9f9d1d3922ec519601 hs17-b13
+0000000000000000000000000000000000000000 hs17-b13
+daafeed82cf5c4dc1e66ac8b2e8705b339a5e937 hs17-b13
+9d9e74a1628edf11f4f2955d18c708b840bf1dd4 hs17-b14
--- a/make/hotspot_version	Tue May 18 20:45:28 2010 +0100
+++ b/make/hotspot_version	Tue May 18 22:40:03 2010 +0100
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=13
+HS_BUILD_NUMBER=14
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=6
--- a/src/share/vm/opto/library_call.cpp	Tue May 18 20:45:28 2010 +0100
+++ b/src/share/vm/opto/library_call.cpp	Tue May 18 22:40:03 2010 +0100
@@ -1177,7 +1177,9 @@
     alloc = AllocateNode::Ideal_allocation(receiver, &_gvn);
 
   Node* result;
-  if (Matcher::has_match_rule(Op_StrIndexOf) && alloc == NULL &&
+  // Disable the use of pcmpestri until it can be guaranteed that
+  // the load doesn't cross in to the uncommited space.
+  if (false && Matcher::has_match_rule(Op_StrIndexOf) &&
       UseSSE42Intrinsics) {
     // Generate SSE4.2 version of indexOf
     // We currently only have match rules that use SSE4.2