# HG changeset patch # User adinn # Date 1490695969 14400 # Node ID 83e23c65e3367d109d57de40564c273bb0dc926f # Parent ac0bfb91f920b7aa076a766cd92d7ed64f3c17db 8177661, PR3367: Correct ad rule output register types from iRegX to iRegXNoSp Backport to jdk8 of JDK9 fix for JDK-8177661 diff -r ac0bfb91f920 -r 83e23c65e336 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Wed Apr 26 02:45:41 2017 +0100 +++ b/src/cpu/aarch64/vm/aarch64.ad Tue Mar 28 06:12:49 2017 -0400 @@ -11404,7 +11404,7 @@ %} instruct string_indexof(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2, - iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr) + iRegI_R0 result, iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr) %{ match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2))); effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, @@ -11422,8 +11422,8 @@ %} instruct string_indexof_con(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, - immI_le_4 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2, - iRegI tmp3, iRegI tmp4, rFlagsReg cr) + immI_le_4 int_cnt2, iRegI_R0 result, iRegINoSp tmp1, iRegINoSp tmp2, + iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr) %{ match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2))); effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,