archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8035104: reorder class file attributes in javap listing

Browse source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2014-03-26 17:50:33 -07:00
parent 3eb793cd06
commit 77ad0945a6
3 changed files with 74 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
View file

@ -202,7 +202,6 @@ public class ClassWriter extends BasicWriter {
if (options.verbose) {
println();
indent(+1);
attrWriter.write(cf, cf.attributes, constant_pool);
println("minor version: " + cf.minor_version);
println("major version: " + cf.major_version);
writeList("flags: ", flags.getClassFlags(), "\n");
@ -218,6 +217,10 @@ public class ClassWriter extends BasicWriter {
writeMethods();
indent(-1);
println("}");
if (options.verbose) {
attrWriter.write(cf, cf.attributes, constant_pool);
}
}
// where
class JavaTypePrinter implements Type.Visitor<StringBuilder,StringBuilder> {

6
langtools/test/tools/javap/T4975569.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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
@ -40,10 +40,10 @@ public class T4975569
verify("T4975569$Anno", "flags: ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION");
verify("T4975569$E", "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM");
verify("T4975569$S", "flags: ACC_BRIDGE, ACC_SYNTHETIC",
"InnerClasses:\n static");
"InnerClasses:\n static");
verify("T4975569$V", "void m(java.lang.String...)",
"flags: ACC_VARARGS");
verify("T4975569$Prot", "InnerClasses:\n protected");
verify("T4975569$Prot", "InnerClasses:\n protected");
//verify("T4975569$Priv", "InnerClasses");
if (errors > 0)
throw new Error(errors + " found.");

67
langtools/test/tools/javap/T8035104.java Normal file
View file

@ -0,0 +1,67 @@
/*
* 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 8035104
* @summary reorder class file attributes in javap listing
*/
import java.io.*;
public class T8035104 {
public static void main(String[] args) throws Exception {
new T8035104().run();
}
public void run() throws Exception {
String[] lines = javap("-v", T8035104.class.getName()).split("[\r\n]+");
int minor = -1;
int SourceFile = -1;
for (int i = 0; i < lines.length; i++) {
String line = lines[i];
if (line.matches(" *minor version: [0-9.]+"))
minor = i;
if (line.matches(" *SourceFile: .+"))
SourceFile = i;
}
if (minor == -1)
throw new Exception("minor version not found");
if (SourceFile == -1)
throw new Exception("SourceFile not found");
if (SourceFile < minor)
throw new Exception("unexpected order of output");
System.out.println("output OK");
}
String javap(String... args) {
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());
System.out.println("javap exited, rc=" + rc);
return sw.toString();
}
}