Mercurial > hg > graal-compiler
changeset 175:f2759c126e9d
Merge
author | rasbold |
---|---|
date | Tue, 03 Jun 2008 15:38:31 -0700 |
parents | 9077d695a1b0 (current diff) 510f98a80563 (diff) |
children | 1f809e010142 86658812ca35 |
files | |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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, \