[PATCH] : Fix wrong message of the ArrayIndexOutOfBoundException

[Alexey Bakhtin]

It seems server removes my attachments
The diff and test are simple, so it is inlined :

Diff:

diff --git a/src/cpu/aarch32/vm/templateInterpreter_aarch32.cpp b/src/cpu/aarch32/vm/templateInterpreter_aarch32.cpp
--- a/src/cpu/aarch32/vm/templateInterpreter_aarch32.cpp
+++ b/src/cpu/aarch32/vm/templateInterpreter_aarch32.cpp
@@ -103,8 +103,7 @@
   // exception happened
   __ empty_expression_stack();
   // setup parameters
-  // ??? convention: expect aberrant index in register r1
-  __ mov(c_rarg2, r1);
+  // ??? convention: expect aberrant index in register r2
   __ mov(c_rarg1, (address)name);
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address,
diff --git a/src/cpu/aarch32/vm/templateTable_aarch32.cpp b/src/cpu/aarch32/vm/templateTable_aarch32.cpp
--- a/src/cpu/aarch32/vm/templateTable_aarch32.cpp
+++ b/src/cpu/aarch32/vm/templateTable_aarch32.cpp
@@ -655,7 +655,7 @@
   __ reg_printf("Checking index in array, array = %p, alen = %d, index = %d\n", array, length, index);
   __ cmp(index, length);
   if (index != r2) {
-    // ??? convention: move aberrant index into r1 for exception message
+    // ??? convention: move aberrant index into r2 for exception message
     assert(r2 != array, "different registers");
     __ mov(r2, index);
   }

And Test:

public class SimpleTest {
    public static void main(String[] args) {
        try {
            String txt = args[1];
        }catch(ArrayIndexOutOfBoundsException e) {
            if (args.length < 2) {
                System.err.println((Integer.parseInt(e.getMessage()) == 1)?"PASSED":"FAILS" + " : " + e.getMessage());
            } else {
                System.err.println("Wrong test configuration");
            }
        }
    }
}

Run test with: java -Xint -jar SimpleTest 100

Regards
Alexey



> On 05 May 2016, at 10:35, Alex Kashchenko <akashche at redhat.com> wrote:
>
> Hi Alexey,
>
> On 05/04/2016 07:03 PM, Alexey Bakhtin wrote:
>> Hi All,
>>
>> There is a minor copy-past issue in the ArrayIndexOutOfBoundException implementation for aarch32 port.
>> Application throws expected java.lang.ArrayIndexOutOfBoundsException with incorrect text (“1686608040" instead of index value) in the Xint mode:
>>
>> There is no such problem in the Xcomp Xbatch mode
>>
>> The reason of the issue : TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler reads index element from the r1 register instead of register r2
>>
>> Suggested fix in the hotspot is:
>>
>>
>>
>> Unit test to reproduce and verify this issue is:
>
> Links or attachments are probably missed here?
>
> --
> -Alex