stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8033930: Unnecessary new line after the StackMapTable

Browse Source 
8033913: Incorrect indentation of StackMapTable entries

Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2014-02-10 11:52:52 -08:00
parent c0d767f6f1
commit 4e86ae9988
2 changed files with 103 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
View File

@ -531,7 +531,6 @@ public class AttributeWriter extends BasicWriter
for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
w.write(entry);
}
println();
indent(-1);
return null;
}
@ -543,7 +542,6 @@ public class AttributeWriter extends BasicWriter
for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
w.write(entry);
}
println();
indent(-1);
return null;
}
@ -555,14 +553,12 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_same_frame(StackMapTable_attribute.same_frame frame, Void p) {
printHeader(frame);
println(" /* same */");
printHeader(frame, "/* same */");
return null;
}
public Void visit_same_locals_1_stack_item_frame(StackMapTable_attribute.same_locals_1_stack_item_frame frame, Void p) {
printHeader(frame);
println(" /* same_locals_1_stack_item */");
printHeader(frame, "/* same_locals_1_stack_item */");
indent(+1);
printMap("stack", frame.stack);
indent(-1);
@ -570,8 +566,7 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_same_locals_1_stack_item_frame_extended(StackMapTable_attribute.same_locals_1_stack_item_frame_extended frame, Void p) {
printHeader(frame);
println(" /* same_locals_1_stack_item_frame_extended */");
printHeader(frame, "/* same_locals_1_stack_item_frame_extended */");
indent(+1);
println("offset_delta = " + frame.offset_delta);
printMap("stack", frame.stack);
@ -580,8 +575,7 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_chop_frame(StackMapTable_attribute.chop_frame frame, Void p) {
printHeader(frame);
println(" /* chop */");
printHeader(frame, "/* chop */");
indent(+1);
println("offset_delta = " + frame.offset_delta);
indent(-1);
@ -589,8 +583,7 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_same_frame_extended(StackMapTable_attribute.same_frame_extended frame, Void p) {
printHeader(frame);
println(" /* same_frame_extended */");
printHeader(frame, "/* same_frame_extended */");
indent(+1);
println("offset_delta = " + frame.offset_delta);
indent(-1);
@ -598,8 +591,7 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_append_frame(StackMapTable_attribute.append_frame frame, Void p) {
printHeader(frame);
println(" /* append */");
printHeader(frame, "/* append */");
indent(+1);
println("offset_delta = " + frame.offset_delta);
printMap("locals", frame.locals);
@ -608,12 +600,11 @@ public class AttributeWriter extends BasicWriter
}
public Void visit_full_frame(StackMapTable_attribute.full_frame frame, Void p) {
printHeader(frame);
if (frame instanceof StackMap_attribute.stack_map_frame) {
printHeader(frame, "offset = " + frame.offset_delta);
indent(+1);
println(" offset = " + frame.offset_delta);
} else {
println(" /* full_frame */");
printHeader(frame, "/* full_frame */");
indent(+1);
println("offset_delta = " + frame.offset_delta);
}
@ -623,8 +614,9 @@ public class AttributeWriter extends BasicWriter
return null;
}
void printHeader(StackMapTable_attribute.stack_map_frame frame) {
print(" frame_type = " + frame.frame_type);
void printHeader(StackMapTable_attribute.stack_map_frame frame, String extra) {
print("frame_type = " + frame.frame_type + " ");
println(extra);
}
void printMap(String name, StackMapTable_attribute.verification_type_info[] map) {

92
langtools/test/tools/javap/StackMapTableTest.java Normal file
View File

@ -0,0 +1,92 @@
/*
* Copyright (c) 2014, 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 8033930 8033913
* @summary bad formatting of StackMapTable entries
*/
import java.io.*;
import java.util.*;
public class StackMapTableTest {
public static void main(String... args) throws Exception {
new StackMapTableTest().run();
}
void run() throws Exception {
String testClasses = System.getProperty("test.classes");
String out = javap("-v", "-classpath", testClasses, A.class.getName());
String nl = System.getProperty("line.separator");
out = out.replaceAll(nl, "\n");
if (out.contains("\n\n\n"))
error("double blank line found");
String expect =
" StackMapTable: number_of_entries = 2\n" +
" frame_type = 252 /* append */\n" +
" offset_delta = 2\n" +
" locals = [ int ]\n" +
" frame_type = 250 /* chop */\n" +
" offset_delta = 18\n";
if (!out.contains(expect))
error("expected text not found");
if (errors > 0)
throw new Exception(errors + " errors found");
}
String javap(String... args) throws Exception {
StringWriter sw = new StringWriter();
PrintWriter out = new PrintWriter(sw);
int rc = com.sun.tools.javap.Main.run(args, out);
out.close();
System.out.println(sw.toString());
if (rc < 0)
throw new Exception("javap exited, rc=" + rc);
return sw.toString();
}
void error(String msg) {
System.out.println("Error: " + msg);
errors++;
}
int errors;
/** Simple test class to run through javap. */
public class A {
public void a() {
for (int i = 0; i < 10; i++) {
System.out.println(i);
}
}
public void b() {
}
public void c() {
}
}
}