# HG changeset patch
# User rasbold
# Date 1212532711 25200
# Node ID f2759c126e9ddd2ab3e7e2ad64835c3ede2a0951
# Parent  9077d695a1b02b068817b207f7b7d8bc7cf29d52# Parent  510f98a80563a2a7490f35d8dec163f00f419423
Merge

diff -r 9077d695a1b0 -r f2759c126e9d src/share/vm/opto/library_call.cpp
--- a/src/share/vm/opto/library_call.cpp	Fri May 30 14:50:19 2008 -0700
+++ b/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();
diff -r 9077d695a1b0 -r f2759c126e9d src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri May 30 14:50:19 2008 -0700
+++ b/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,                                      \