infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 18:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

8136453: Parameter name indices array size not updated correctly

Browse Source 
Correctly resizing ClassReader.parameterNameIndices array.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2016-06-21 21:06:54 +02:00
parent 0d9142bf89
commit 6f94a3f4bf
3 changed files with 178 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
View File

@ -1039,7 +1039,8 @@ public class ClassReader {
if (start_pc == 0) {
// ensure array large enough
if (register >= parameterNameIndices.length) {
int newSize = Math.max(register, parameterNameIndices.length + 8);
int newSize =
Math.max(register + 1, parameterNameIndices.length + 8);
parameterNameIndices =
Arrays.copyOf(parameterNameIndices, newSize);
}

112
langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T.jcod Normal file
View File

@ -0,0 +1,112 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
class T {
0xCAFEBABE;
0; // minor version
52; // version
[] { // Constant Pool
; // first element is empty
Method #3 #15; // #1
class #16; // #2
class #17; // #3
Utf8 "<init>"; // #4
Utf8 "()V"; // #5
Utf8 "Code"; // #6
Utf8 "LocalVariableTable"; // #7
Utf8 "this"; // #8
Utf8 "LT;"; // #9
Utf8 "test"; // #10
Utf8 "(I)I"; // #11
Utf8 "p"; // #12
Utf8 "I"; // #13
Utf8 "l1"; // #14
NameAndType #4 #5; // #15
Utf8 "T"; // #16
Utf8 "java/lang/Object"; // #17
} // Constant Pool
0x0021; // access
#2;// this_cpx
#3;// super_cpx
[] { // Interfaces
} // Interfaces
[] { // fields
} // fields
[] { // methods
{ // Member
0x0001; // access
#4; // name_cpx
#5; // sig_cpx
[] { // Attributes
Attr(#6) { // Code
1; // max_stack
1; // max_locals
Bytes[]{
0x2AB70001B1;
};
[] { // Traps
} // end Traps
[] { // Attributes
Attr(#7) { // LocalVariableTable
[] { // LocalVariableTable
0 5 8 9 0;
}
} // end LocalVariableTable
} // Attributes
} // end Code
} // Attributes
} // Member
;
{ // Member
0x0001; // access
#10; // name_cpx
#11; // sig_cpx
[] { // Attributes
Attr(#6) { // Code
1; // max_stack
3; // max_locals
Bytes[]{
0x033D1CAC;
};
[] { // Traps
} // end Traps
[] { // Attributes
Attr(#7) { // LocalVariableTable
[] { // LocalVariableTable
0 4 8 9 0;
0 4 12 13 1;
0 4 14 13 20;
}
} // end LocalVariableTable
} // Attributes
} // end Code
} // Attributes
} // Member
} // methods
[] { // Attributes
} // Attributes
} // end class T

64
langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8136453
* @summary Checking that javac's ClassReader expands its parameterNameIndices array properly.
* @modules jdk.compiler
* @build T T8136453
* @run main T8136453
*/
import java.util.Arrays;
import java.util.List;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.util.ElementFilter;
import javax.tools.JavaCompiler;
import javax.tools.ToolProvider;
import com.sun.source.util.JavacTask;
public class T8136453 {
public static void main(String... args) {
new T8136453().run();
}
void run() {
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
List<String> opts = Arrays.asList("-XDsave-parameter-names");
JavacTask task = (JavacTask) compiler.getTask(null, null, null, opts, null, null);
TypeElement t = task.getElements().getTypeElement("T");
ExecutableElement testMethod = ElementFilter.methodsIn(t.getEnclosedElements()).get(0);
VariableElement param = testMethod.getParameters().get(0);
Name paramName = param.getSimpleName();
if (!paramName.contentEquals("p")) {
throw new AssertionError("Wrong parameter name: " + paramName);
}
}
}