archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8201593: Print array length in ArrayIndexOutOfBoundsException

Browse source 
Reviewed-by: dholmes, mdoerr, smonteith, shade, rriggs
This commit is contained in:
Goetz Lindenmaier 2018-05-07 09:11:21 +02:00
parent b812ae6e51
commit ac3043c692
34 changed files with 675 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -185,18 +185,16 @@ address TemplateInterpreterGenerator::generate_StackOverflowError_handler() {
return entry;
}
address TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler(const char* name) {
address TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler() {
address entry = __ pc();
// index is in R4_ArrayIndexOutOfBounds_index
InlinedString Lname(name);
// expression stack must be empty before entering the VM if an exception happened
__ empty_expression_stack();
// setup parameters
__ ldr_literal(R1, Lname);
// Array expected in R1.
__ mov(R2, R4_ArrayIndexOutOfBounds_index);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException), R1, R2);
@ -204,7 +202,6 @@ address TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler(con
__ nop(); // to avoid filling CPU pipeline with invalid instructions
__ nop();
__ should_not_reach_here();
__ bind_literal(Lname);
return entry;
}