Mercurial > hg > release > icedtea6-1.13
view patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch @ 3245:17669a12c966
New backports for issues to be fixed in 1.13.11.
S6863746, PR2951: javap should not scan ct.sym by default
S8071705, PR2820, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
S8150954, PR2868, RH1176206: AWT Robot not compatible with GNOME Shell
PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
2016-05-03 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/6307603-xrender-01.patch:
Regenerated after application of 8150954 / PR2868.
* patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch,
* patches/openjdk/8071705-pr2820-menu_misbehaviour.patch,
* patches/openjdk/8150954-pr2868-composite_desktop.patch,
* patches/pr2890-system_cacerts.patch:
New backports for issues to be fixed in 1.13.11.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 04 May 2016 02:51:07 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User jjg # Date 1248472021 25200 # Fri Jul 24 14:47:01 2009 -0700 # Node ID 6314258404082d265b65fd8dce47de6ad550a50a # Parent 49387c1440d088a737f21c332835fcb06fc0d1b2 6863746: javap should not scan ct.sym by default Reviewed-by: mcimadamore diff -r 49387c1440d0 -r 631425840408 src/share/classes/com/sun/tools/javap/JavapFileManager.java --- openjdk/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java Thu Jul 23 14:15:58 2009 -0700 +++ openjdk/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java Fri Jul 24 14:47:01 2009 -0700 @@ -44,6 +44,7 @@ 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) { diff -r 49387c1440d0 -r 631425840408 src/share/classes/com/sun/tools/javap/JavapTask.java --- openjdk/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Thu Jul 23 14:15:58 2009 -0700 +++ openjdk/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Fri Jul 24 14:47:01 2009 -0700 @@ -235,12 +235,6 @@ } }, - 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 @@ 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"); diff -r 49387c1440d0 -r 631425840408 src/share/classes/com/sun/tools/javap/Options.java --- openjdk/langtools/src/share/classes/com/sun/tools/javap/Options.java Thu Jul 23 14:15:58 2009 -0700 +++ openjdk/langtools/src/share/classes/com/sun/tools/javap/Options.java Fri Jul 24 14:47:01 2009 -0700 @@ -88,5 +88,4 @@ public boolean compat; // bug-for-bug compatibility mode with old javap public boolean jsr277; - public boolean ignoreSymbolFile; // file manager should ignore ct.sym } diff -r 49387c1440d0 -r 631425840408 test/tools/javap/T6863746.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ openjdk/langtools/test/tools/javap/T6863746.java Fri Jul 24 14:47:01 2009 -0700 @@ -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"); + } +}