Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorrasbold
Tue, 03 Jun 2008 15:38:31 -0700
changeset 601 f1627dd48d57
parent 599 713a6fc0ed2d (current diff)
parent 600 f7b4f99c0199 (diff)
child 605 a4a9ed21e981
child 747 548e982ebcb5
Merge
--- a/hotspot/src/share/vm/opto/library_call.cpp	Fri May 30 14:50:19 2008 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Tue Jun 03 15:38:31 2008 -0700
@@ -823,6 +823,8 @@
 //------------------------------inline_array_equals----------------------------
 bool LibraryCallKit::inline_array_equals() {
 
+  if (!Matcher::has_match_rule(Op_AryEq)) return false;
+
   _sp += 2;
   Node *argument2 = pop();
   Node *argument1 = pop();
--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri May 30 14:50:19 2008 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Tue Jun 03 15:38:31 2008 -0700
@@ -460,7 +460,7 @@
   develop(bool, SpecialStringIndexOf, true,                                 \
           "special version of string indexOf")                              \
                                                                             \
-  product(bool, SpecialArraysEquals, true,                                  \
+  product(bool, SpecialArraysEquals, false,                                 \
           "special version of Arrays.equals(char[],char[])")                \
                                                                             \
   develop(bool, TraceCallFixup, false,                                      \
jdk-sandbox