jdk8-mips64-public/langtools: comparison test/tools/javac/T7093325.java

-:d07340b61e6a
+:954541f13717
 /*
-* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2011, 2013, 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.
 /*
 * @test
 * @bug 7093325
 * @summary Redundant entry in bytecode exception table
+* @library lib
+* @build JavacTestingAbstractThreadedTest
+* @run main T7093325
 */
+import java.io.File;
+import java.net.URI;
+import java.util.Arrays;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
 import com.sun.source.util.JavacTask;
 import com.sun.tools.classfile.Attribute;
 import com.sun.tools.classfile.ClassFile;
 import com.sun.tools.classfile.Code_attribute;
 import com.sun.tools.classfile.ConstantPool.*;
 import com.sun.tools.classfile.Method;
-import com.sun.tools.javac.api.JavacTool;
+public class T7093325
-import java.io.File;
+extends JavacTestingAbstractThreadedTest
-import java.net.URI;
+implements Runnable {
-import java.util.Arrays;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
-public class T7093325 {
-/** global decls ***/
-// Create a single file manager and reuse it for each compile to save time.
-static StandardJavaFileManager fm = JavacTool.create().getStandardFileManager(null, null, null);
-//statistics
-static int checkCount = 0;
 enum StatementKind {
 THROW("throw new RuntimeException();", false, false),
 RETURN_NONEMPTY("System.out.println(); return;", true, false),
 RETURN_EMPTY("return;", true, true),
 String catchers() {
 if (this.ordinal() == 0) {
 return catchStr;
 } else {
-return CatchArity.values()[this.ordinal() - 1].catchers() + catchStr;
+return CatchArity.values()[this.ordinal() - 1].catchers() +
+catchStr;
 }
 }
 }
 public static void main(String... args) throws Exception {
 for (CatchArity ca : CatchArity.values()) {
 for (StatementKind stmt0 : StatementKind.values()) {
 if (ca.ordinal() == 0) {
-new T7093325(ca, stmt0).compileAndCheck();
+pool.execute(new T7093325(ca, stmt0));
 continue;
 }
 for (StatementKind stmt1 : StatementKind.values()) {
 if (ca.ordinal() == 1) {
-new T7093325(ca, stmt0, stmt1).compileAndCheck();
+pool.execute(new T7093325(ca, stmt0, stmt1));
 continue;
 }
 for (StatementKind stmt2 : StatementKind.values()) {
 if (ca.ordinal() == 2) {
-new T7093325(ca, stmt0, stmt1, stmt2).compileAndCheck();
+pool.execute(new T7093325(ca, stmt0, stmt1, stmt2));
 continue;
 }
 for (StatementKind stmt3 : StatementKind.values()) {
 if (ca.ordinal() == 3) {
-new T7093325(ca, stmt0, stmt1, stmt2, stmt3).compileAndCheck();
+pool.execute(
+new T7093325(ca, stmt0, stmt1, stmt2, stmt3));
 continue;
 }
 for (StatementKind stmt4 : StatementKind.values()) {
 if (ca.ordinal() == 4) {
-new T7093325(ca, stmt0, stmt1, stmt2, stmt3, stmt4).compileAndCheck();
+pool.execute(
+new T7093325(ca, stmt0, stmt1,
+stmt2, stmt3, stmt4));
 continue;
 }
 for (StatementKind stmt5 : StatementKind.values()) {
-new T7093325(ca, stmt0, stmt1, stmt2, stmt3, stmt4, stmt5).compileAndCheck();
+pool.execute(
+new T7093325(ca, stmt0, stmt1, stmt2,
+stmt3, stmt4, stmt5));
 }
 }
 }
 }
 }
 }
 }
-System.out.println("Total checks made: " + checkCount);
+checkAfterExec();
 }
 /** instance decls **/
 CatchArity ca;
 public T7093325(CatchArity ca, StatementKind... stmts) {
 this.ca = ca;
 this.stmts = stmts;
 }
-void compileAndCheck() throws Exception {
+@Override
+public void run() {
+int id = checkCount.incrementAndGet();
 final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
-JavaSource source = new JavaSource();
+JavaSource source = new JavaSource(id);
-JavacTask ct = (JavacTask)tool.getTask(null, fm, null,
+JavacTask ct = (JavacTask)tool.getTask(null, fm.get(), null,
 null, null, Arrays.asList(source));
 ct.call();
-verifyBytecode(source);
+verifyBytecode(source, id);
 }
-void verifyBytecode(JavaSource source) {
+void verifyBytecode(JavaSource source, int id) {
-checkCount++;
 boolean lastInlined = false;
 boolean hasCode = false;
 int gapsCount = 0;
 for (int i = 0; i < stmts.length ; i++) {
 lastInlined = stmts[i].canInline;
 gapsCount++;
 }
 //System.out.printf("gaps %d \n %s \n", gapsCount, source.toString());
-File compiledTest = new File("Test.class");
+File compiledTest = new File(String.format("Test%s.class", id));
 try {
 ClassFile cf = ClassFile.read(compiledTest);
 if (cf == null) {
-throw new Error("Classfile not found: " + compiledTest.getName());
+throw new Error("Classfile not found: " +
+compiledTest.getName());
 }
 Method test_method = null;
 for (Method m : cf.methods) {
 if (m.getName(cf.constant_pool).equals("test")) {
 "class A extends RuntimeException {} \n" +
 "class B extends RuntimeException {} \n" +
 "class C extends RuntimeException {} \n" +
 "class D extends RuntimeException {} \n" +
 "class E extends RuntimeException {} \n" +
-"class Test {\n" +
+"class Test#ID {\n" +
 "   void test() {\n" +
 "   try { #S0 } #C finally { System.out.println(); }\n" +
 "   }\n" +
 "}";
 String source;
-public JavaSource() {
+public JavaSource(int id) {
-super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+super(URI.create(String.format("myfo:/Test%s.java", id)),
+JavaFileObject.Kind.SOURCE);
 source = source_template.replace("#C", ca.catchers());
 source = source.replace("#S0", stmts[0].stmt);
+source = source.replace("#ID", String.valueOf(id));
 for (int i = 1; i < ca.ordinal() + 1; i++) {
 source = source.replace("#S" + i, stmts[i].stmt);
 }
 }
 @Override
 public CharSequence getCharContent(boolean ignoreEncodingErrors) {
 return source;
 }
 }
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: test/tools/javac/T7093325.java

test/tools/javac/T7093325.java