infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-06 11:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

6863746: javap should not scan ct.sym by default

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2009-07-24 14:47:01 -07:00
parent ae71131125
commit 604fce4d26
4 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
View File

@ -44,6 +44,7 @@ import com.sun.tools.javac.util.Context;
class JavapFileManager extends JavacFileManager {
private JavapFileManager(Context context, Charset charset) {
super(context, true, charset);
setIgnoreSymbolFile(true);
}
static JavapFileManager create(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log, Options options) {

9
langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
View File

@ -235,12 +235,6 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
}
},
new Option(false, "-XDignore.symbol.file") {
void process(JavapTask task, String opt, String arg) {
task.options.ignoreSymbolFile = true;
}
},
new Option(false, "-XDdetails") {
void process(JavapTask task, String opt, String arg) {
task.options.details = EnumSet.allOf(InstructionDetailWriter.Kind.class);
@ -477,9 +471,6 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
throw new BadArgs("err.incompatible.options", sb);
}
if (options.ignoreSymbolFile && fileManager instanceof JavapFileManager)
((JavapFileManager) fileManager).setIgnoreSymbolFile(true);
if ((classes == null || classes.size() == 0) &&
!(noArgs || options.help || options.version || options.fullVersion)) {
throw new BadArgs("err.no.classes.specified");

1
langtools/src/share/classes/com/sun/tools/javap/Options.java
View File

@ -88,5 +88,4 @@ public class Options {
public boolean compat; // bug-for-bug compatibility mode with old javap
public boolean jsr277;
public boolean ignoreSymbolFile; // file manager should ignore ct.sym
}

52
langtools/test/tools/javap/T6863746.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
import java.io.*;
/*
* @test
* @bug 6863746
* @summary javap should not scan ct.sym by default
*/
public class T6863746 {
public static void main(String... args) throws Exception{
new T6863746().run();
}
public void run() throws Exception {
String[] args = { "-c", "java.lang.Object" };
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
int rc = com.sun.tools.javap.Main.run(args, pw);
pw.close();
String out = sw.toString();
System.out.println(out);
String[] lines = out.split("\n");
// If ct.sym is being read, the output does not include
// Code attributes, so check for Code attributes as a
// way of detecting that ct.sym is not being used.
if (lines.length < 50 || out.indexOf("Code:") == -1)
throw new Exception("unexpected output from javap");
}
}