() {
- @DefinedBy(Api.LANGUAGE_MODEL)
- public Boolean defaultAction(TypeMirror t, Void p){
- return false;
- }
- @DefinedBy(Api.LANGUAGE_MODEL)
- public Boolean visitArray(ArrayType t, Void p) {
- return visit(t.getComponentType(), p);
- }
- @DefinedBy(Api.LANGUAGE_MODEL)
- public Boolean visitPrimitive(PrimitiveType t, Void p) {
- TypeKind tk = t.getKind();
- return (tk == TypeKind.LONG || tk == TypeKind.DOUBLE);
- }
- };
- return v.visit(t, null);
- }
-
- /* Do unicode to ansi C identifier conversion.
- %%% This may not be right, but should be called more often. */
- protected final String nameToIdentifier(String name) {
- int len = name.length();
- StringBuilder buf = new StringBuilder(len);
- for (int i = 0; i < len; i++) {
- char c = name.charAt(i);
- if (isASCIILetterOrDigit(c))
- buf.append(c);
- else if (c == '/')
- buf.append('_');
- else if (c == '.')
- buf.append('_');
- else if (c == '_')
- buf.append("_1");
- else if (c == ';')
- buf.append("_2");
- else if (c == '[')
- buf.append("_3");
- else
- buf.append("_0" + ((int)c));
- }
- return new String(buf);
- }
-
- protected final boolean isASCIILetterOrDigit(char c) {
- if (((c >= 'A') && (c <= 'Z')) ||
- ((c >= 'a') && (c <= 'z')) ||
- ((c >= '0') && (c <= '9')))
- return true;
- else
- return false;
- }
-}
-
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java 2017-11-09 15:06:38.433841979 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.tools.javah;
-
-import java.io.PrintWriter;
-
-/**
- * Main entry point.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class Main {
- /**
- * Main entry point for the launcher.
- * Note: This method calls System.exit.
- * @param args command line arguments
- */
- public static void main(String[] args) {
- JavahTask t = new JavahTask();
- int rc = t.run(args);
- System.exit(rc);
- }
-
- /**
- * Entry point that does not call System.exit.
- * @param args command line arguments
- * @param out output stream
- * @return an exit code. 0 means success, non-zero means an error occurred.
- */
- public static int run(String[] args, PrintWriter out) {
- JavahTask t = new JavahTask();
- t.setLog(out);
- return t.run(args);
- }
-}
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java 2017-11-09 15:06:39.021867646 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2002, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.tools.javah;
-
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-
-/**
- * A utility for mangling java identifiers into C names. Should make
- * this more fine grained and distribute the functionality to the
- * generators.
- *
- *
This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.
- *
- * @author Sucheta Dambalkar(Revised)
- */
-public class Mangle {
-
- public static class Type {
- public static final int CLASS = 1;
- public static final int FIELDSTUB = 2;
- public static final int FIELD = 3;
- public static final int JNI = 4;
- public static final int SIGNATURE = 5;
- public static final int METHOD_JDK_1 = 6;
- public static final int METHOD_JNI_SHORT = 7;
- public static final int METHOD_JNI_LONG = 8;
- }
-
- private Elements elems;
- private Types types;
-
- Mangle(Elements elems, Types types) {
- this.elems = elems;
- this.types = types;
- }
-
- public final String mangle(CharSequence name, int mtype) {
- StringBuilder result = new StringBuilder(100);
- int length = name.length();
-
- for (int i = 0; i < length; i++) {
- char ch = name.charAt(i);
- if (isalnum(ch)) {
- result.append(ch);
- } else if ((ch == '.') &&
- mtype == Mangle.Type.CLASS) {
- result.append('_');
- } else if (( ch == '$') &&
- mtype == Mangle.Type.CLASS) {
- result.append('_');
- result.append('_');
- } else if (ch == '_' && mtype == Mangle.Type.FIELDSTUB) {
- result.append('_');
- } else if (ch == '_' && mtype == Mangle.Type.CLASS) {
- result.append('_');
- } else if (mtype == Mangle.Type.JNI) {
- String esc = null;
- if (ch == '_')
- esc = "_1";
- else if (ch == '.')
- esc = "_";
- else if (ch == ';')
- esc = "_2";
- else if (ch == '[')
- esc = "_3";
- if (esc != null) {
- result.append(esc);
- } else {
- result.append(mangleChar(ch));
- }
- } else if (mtype == Mangle.Type.SIGNATURE) {
- if (isprint(ch)) {
- result.append(ch);
- } else {
- result.append(mangleChar(ch));
- }
- } else {
- result.append(mangleChar(ch));
- }
- }
-
- return result.toString();
- }
-
- public String mangleMethod(ExecutableElement method, TypeElement clazz,
- int mtype) throws TypeSignature.SignatureException {
- StringBuilder result = new StringBuilder(100);
- result.append("Java_");
-
- if (mtype == Mangle.Type.METHOD_JDK_1) {
- result.append(mangle(clazz.getQualifiedName(), Mangle.Type.CLASS));
- result.append('_');
- result.append(mangle(method.getSimpleName(),
- Mangle.Type.FIELD));
- result.append("_stub");
- return result.toString();
- }
-
- /* JNI */
- result.append(mangle(getInnerQualifiedName(clazz), Mangle.Type.JNI));
- result.append('_');
- result.append(mangle(method.getSimpleName(),
- Mangle.Type.JNI));
- if (mtype == Mangle.Type.METHOD_JNI_LONG) {
- result.append("__");
- String typesig = signature(method);
- TypeSignature newTypeSig = new TypeSignature(elems);
- String sig = newTypeSig.getTypeSignature(typesig, method.getReturnType());
- sig = sig.substring(1);
- sig = sig.substring(0, sig.lastIndexOf(')'));
- sig = sig.replace('/', '.');
- result.append(mangle(sig, Mangle.Type.JNI));
- }
-
- return result.toString();
- }
- //where
- private String getInnerQualifiedName(TypeElement clazz) {
- return elems.getBinaryName(clazz).toString();
- }
-
- public final String mangleChar(char ch) {
- String s = Integer.toHexString(ch);
- int nzeros = 5 - s.length();
- char[] result = new char[6];
- result[0] = '_';
- for (int i = 1; i <= nzeros; i++)
- result[i] = '0';
- for (int i = nzeros+1, j = 0; i < 6; i++, j++)
- result[i] = s.charAt(j);
- return new String(result);
- }
-
- // Warning: duplicated in Gen
- private String signature(ExecutableElement e) {
- StringBuilder sb = new StringBuilder();
- String sep = "(";
- for (VariableElement p: e.getParameters()) {
- sb.append(sep);
- sb.append(types.erasure(p.asType()).toString());
- sep = ",";
- }
- sb.append(")");
- return sb.toString();
- }
-
- /* Warning: Intentional ASCII operation. */
- private static boolean isalnum(char ch) {
- return ch <= 0x7f && /* quick test */
- ((ch >= 'A' && ch <= 'Z') ||
- (ch >= 'a' && ch <= 'z') ||
- (ch >= '0' && ch <= '9'));
- }
-
- /* Warning: Intentional ASCII operation. */
- private static boolean isprint(char ch) {
- return ch >= 32 && ch <= 126;
- }
-}
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java 2017-11-09 15:06:39.581892090 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2005, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.tools.javah; //javax.tools;
-
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.Locale;
-import java.util.concurrent.Callable;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileObject;
-import javax.tools.OptionChecker;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.Tool;
-
-/**
- * This class is intended to be put in javax.tools.
- *
- * @see DiagnosticListener
- * @see Diagnostic
- * @see JavaFileManager
- * @since 1.7
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public interface NativeHeaderTool extends Tool, OptionChecker {
-
- /**
- * Creates a future for a native header task with the given
- * components and arguments. The task might not have
- * completed as described in the NativeHeaderTask interface.
- *
- *
If a file manager is provided, it must be able to handle all
- * locations defined in {@link StandardLocation}.
- *
- * @param out a Writer for additional output from the task;
- * use {@code System.err} if {@code null}
- * @param fileManager a file manager; if {@code null} use the
- * task's standard filemanager
- * @param diagnosticListener a diagnostic listener; if {@code
- * null} use the compiler's default method for reporting
- * diagnostics
- * @param options task options, {@code null} means no options
- * @param classes class names for which native headers should be generated
- * @return an object representing the task to be done
- * @throws RuntimeException if an unrecoverable error
- * occurred in a user supplied component. The
- * {@linkplain Throwable#getCause() cause} will be the error in
- * user code.
- * @throws IllegalArgumentException if any of the given
- * compilation units are of other kind than
- * {@linkplain JavaFileObject.Kind#SOURCE source}
- */
- NativeHeaderTask getTask(Writer out,
- JavaFileManager fileManager,
- DiagnosticListener diagnosticListener,
- Iterable options,
- Iterable classes);
-
- /**
- * Returns a new instance of the standard file manager implementation
- * for this tool. The file manager will use the given diagnostic
- * listener for producing any non-fatal diagnostics. Fatal errors
- * will be signalled with the appropriate exceptions.
- *
- * The standard file manager will be automatically reopened if
- * it is accessed after calls to {@code flush} or {@code close}.
- * The standard file manager must be usable with other tools.
- *
- * @param diagnosticListener a diagnostic listener for non-fatal
- * diagnostics; if {@code null} use the tool's default method
- * for reporting diagnostics
- * @param locale the locale to apply when formatting diagnostics;
- * {@code null} means the {@linkplain Locale#getDefault() default locale}.
- * @param charset the character set used for decoding bytes; if
- * {@code null} use the platform default
- * @return the standard file manager
- */
- StandardJavaFileManager getStandardFileManager(
- DiagnosticListener diagnosticListener,
- Locale locale,
- Charset charset);
-
- /**
- * Interface representing a future for a native header task. The
- * task has not yet started. To start the task, call
- * the {@linkplain #call call} method.
- *
- *
Before calling the call method, additional aspects of the
- * task can be configured, for example, by calling the
- * {@linkplain #setLocale setLocale} method.
- */
- interface NativeHeaderTask extends Callable {
-
- /**
- * Set the locale to be applied when formatting diagnostics and
- * other localized data.
- *
- * @param locale the locale to apply; {@code null} means apply no
- * locale
- * @throws IllegalStateException if the task has started
- */
- void setLocale(Locale locale);
-
- /**
- * Performs this native header task. The task may only
- * be performed once. Subsequent calls to this method throw
- * IllegalStateException.
- *
- * @return true if and only all the files were processed without errors;
- * false otherwise
- *
- * @throws RuntimeException if an unrecoverable error occurred
- * in a user-supplied component. The
- * {@linkplain Throwable#getCause() cause} will be the error
- * in user code.
- * @throws IllegalStateException if called more than once
- */
- Boolean call();
- }
-}
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java 2017-11-09 15:06:40.085914090 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2002, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.tools.javah;
-
-import java.util.*;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.NoType;
-import javax.lang.model.type.PrimitiveType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.TypeVariable;
-import javax.lang.model.type.TypeVisitor;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.SimpleTypeVisitor9;
-
-import com.sun.tools.javac.util.DefinedBy;
-import com.sun.tools.javac.util.DefinedBy.Api;
-
-/**
- * Returns internal type signature.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.
- *
- * @author Sucheta Dambalkar
- */
-
-public class TypeSignature {
- static class SignatureException extends Exception {
- private static final long serialVersionUID = 1L;
- SignatureException(String reason) {
- super(reason);
- }
- }
-
- Elements elems;
-
- /* Signature Characters */
-
- private static final String SIG_VOID = "V";
- private static final String SIG_BOOLEAN = "Z";
- private static final String SIG_BYTE = "B";
- private static final String SIG_CHAR = "C";
- private static final String SIG_SHORT = "S";
- private static final String SIG_INT = "I";
- private static final String SIG_LONG = "J";
- private static final String SIG_FLOAT = "F";
- private static final String SIG_DOUBLE = "D";
- private static final String SIG_ARRAY = "[";
- private static final String SIG_CLASS = "L";
-
-
-
- public TypeSignature(Elements elems){
- this.elems = elems;
- }
-
- /*
- * Returns the type signature of a field according to JVM specs
- */
- public String getTypeSignature(String javasignature) throws SignatureException {
- return getParamJVMSignature(javasignature);
- }
-
- /*
- * Returns the type signature of a method according to JVM specs
- */
- public String getTypeSignature(String javasignature, TypeMirror returnType)
- throws SignatureException {
- String signature = null; //Java type signature.
- String typeSignature = null; //Internal type signature.
- List params = new ArrayList<>(); //List of parameters.
- String paramsig = null; //Java parameter signature.
- String paramJVMSig = null; //Internal parameter signature.
- String returnSig = null; //Java return type signature.
- String returnJVMType = null; //Internal return type signature.
- int dimensions = 0; //Array dimension.
-
- int startIndex = -1;
- int endIndex = -1;
- StringTokenizer st = null;
- int i = 0;
-
- // Gets the actual java signature without parentheses.
- if (javasignature != null) {
- startIndex = javasignature.indexOf("(");
- endIndex = javasignature.indexOf(")");
- }
-
- if (((startIndex != -1) && (endIndex != -1))
- &&(startIndex+1 < javasignature.length())
- &&(endIndex < javasignature.length())) {
- signature = javasignature.substring(startIndex+1, endIndex);
- }
-
- // Separates parameters.
- if (signature != null) {
- if (signature.contains(",")) {
- st = new StringTokenizer(signature, ",");
- if (st != null) {
- while (st.hasMoreTokens()) {
- params.add(st.nextToken());
- }
- }
- } else {
- params.add(signature);
- }
- }
-
- /* JVM type signature. */
- typeSignature = "(";
-
- // Gets indivisual internal parameter signature.
- while (params.isEmpty() != true) {
- paramsig = params.remove(i).trim();
- paramJVMSig = getParamJVMSignature(paramsig);
- if (paramJVMSig != null) {
- typeSignature += paramJVMSig;
- }
- }
-
- typeSignature += ")";
-
- // Get internal return type signature.
-
- returnJVMType = "";
- if (returnType != null) {
- dimensions = dimensions(returnType);
- }
-
- //Gets array dimension of return type.
- while (dimensions-- > 0) {
- returnJVMType += "[";
- }
- if (returnType != null) {
- returnSig = qualifiedTypeName(returnType);
- returnJVMType += getComponentType(returnSig);
- } else {
- System.out.println("Invalid return type.");
- }
-
- typeSignature += returnJVMType;
-
- return typeSignature;
- }
-
- /*
- * Returns internal signature of a parameter.
- */
- private String getParamJVMSignature(String paramsig) throws SignatureException {
- String paramJVMSig = "";
- String componentType ="";
-
- if(paramsig != null){
-
- if(paramsig.contains("[]")) {
- // Gets array dimension.
- int endindex = paramsig.indexOf("[]");
- componentType = paramsig.substring(0, endindex);
- String dimensionString = paramsig.substring(endindex);
- if(dimensionString != null){
- while(dimensionString.contains("[]")){
- paramJVMSig += "[";
- int beginindex = dimensionString.indexOf("]") + 1;
- if(beginindex < dimensionString.length()){
- dimensionString = dimensionString.substring(beginindex);
- }else
- dimensionString = "";
- }
- }
- } else componentType = paramsig;
-
- paramJVMSig += getComponentType(componentType);
- }
- return paramJVMSig;
- }
-
- /*
- * Returns internal signature of a component.
- */
- private String getComponentType(String componentType) throws SignatureException {
-
- String JVMSig = "";
-
- if(componentType != null){
- switch (componentType) {
- case "void": JVMSig += SIG_VOID; break;
- case "boolean": JVMSig += SIG_BOOLEAN; break;
- case "byte": JVMSig += SIG_BYTE; break;
- case "char": JVMSig += SIG_CHAR; break;
- case "short": JVMSig += SIG_SHORT; break;
- case "int": JVMSig += SIG_INT; break;
- case "long": JVMSig += SIG_LONG; break;
- case "float": JVMSig += SIG_FLOAT; break;
- case "double": JVMSig += SIG_DOUBLE; break;
- default:
- if (!componentType.equals("")) {
- TypeElement classNameDoc = elems.getTypeElement(componentType);
-
- if (classNameDoc == null) {
- throw new SignatureException(componentType);
- }
- else {
- String classname = classNameDoc.getQualifiedName().toString();
- String newclassname = classname.replace('.', '/');
- JVMSig += "L";
- JVMSig += newclassname;
- JVMSig += ";";
- }
- }
- break;
- }
- }
- return JVMSig;
- }
-
- int dimensions(TypeMirror t) {
- if (t.getKind() != TypeKind.ARRAY)
- return 0;
- return 1 + dimensions(((ArrayType) t).getComponentType());
- }
-
-
- String qualifiedTypeName(TypeMirror type) {
- TypeVisitor v = new SimpleTypeVisitor9() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
- public Name visitArray(ArrayType t, Void p) {
- return t.getComponentType().accept(this, p);
- }
-
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
- public Name visitDeclared(DeclaredType t, Void p) {
- return ((TypeElement) t.asElement()).getQualifiedName();
- }
-
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
- public Name visitPrimitive(PrimitiveType t, Void p) {
- return elems.getName(t.toString());
- }
-
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
- public Name visitNoType(NoType t, Void p) {
- if (t.getKind() == TypeKind.VOID)
- return elems.getName("void");
- return defaultAction(t, p);
- }
-
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
- public Name visitTypeVariable(TypeVariable t, Void p) {
- return t.getUpperBound().accept(this, p);
- }
- };
- return v.visit(type).toString();
- }
-}
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java 2017-11-09 15:06:40.561934868 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2002, 2016, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package com.sun.tools.javah;
-
-import java.io.PrintWriter;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import javax.tools.Diagnostic;
-import javax.tools.Diagnostic.Kind;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileObject;
-
-import com.sun.tools.javac.util.DefinedBy;
-import com.sun.tools.javac.util.DefinedBy.Api;
-
-/**
- * Messages, verbose and error handling support.
- *
- * For errors, the failure modes are:
- * error -- User did something wrong
- * bug -- Bug has occurred in javah
- * fatal -- We can't even find resources, so bail fast, don't localize
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.
- */
-public class Util {
- /** Exit is used to replace the use of System.exit in the original javah.
- */
- public static class Exit extends Error {
- private static final long serialVersionUID = 430820978114067221L;
- Exit(int exitValue) {
- this(exitValue, null);
- }
-
- Exit(int exitValue, Throwable cause) {
- super(cause);
- this.exitValue = exitValue;
- this.cause = cause;
- }
-
- Exit(Exit e) {
- this(e.exitValue, e.cause);
- }
-
- public final int exitValue;
- public final Throwable cause;
- }
-
- /*
- * Help for verbosity.
- */
- public boolean verbose = false;
-
- public PrintWriter log;
- public DiagnosticListener dl;
-
- Util(PrintWriter log, DiagnosticListener dl) {
- this.log = log;
- this.dl = dl;
- }
-
- public void log(String s) {
- log.println(s);
- }
-
- /*
- * Help for loading localized messages.
- */
- private ResourceBundle m;
-
- private void initMessages() throws Exit {
- try {
- m = ResourceBundle.getBundle("com.sun.tools.javah.resources.l10n");
- } catch (MissingResourceException mre) {
- fatal("Error loading resources. Please file a bug report.", mre);
- }
- }
-
- private String getText(String key, Object... args) throws Exit {
- if (m == null)
- initMessages();
- try {
- return MessageFormat.format(m.getString(key), args);
- } catch (MissingResourceException e) {
- fatal("Key " + key + " not found in resources.", e);
- }
- return null; /* dead code */
- }
-
- /*
- * Failure modes.
- */
- public void bug(String key) throws Exit {
- bug(key, null);
- }
-
- public void bug(String key, Exception e) throws Exit {
- dl.report(createDiagnostic(Diagnostic.Kind.ERROR, key));
- dl.report(createDiagnostic(Diagnostic.Kind.NOTE, "bug.report"));
- throw new Exit(11, e);
- }
-
- public void error(String key, Object... args) throws Exit {
- dl.report(createDiagnostic(Diagnostic.Kind.ERROR, key, args));
- throw new Exit(15);
- }
-
- private void fatal(String msg, Exception e) throws Exit {
- dl.report(createDiagnostic(Diagnostic.Kind.ERROR, "", msg));
- throw new Exit(10, e);
- }
-
- private Diagnostic createDiagnostic(
- final Diagnostic.Kind kind, final String code, final Object... args) {
- return new Diagnostic() {
- @DefinedBy(Api.COMPILER)
- public String getCode() {
- return code;
- }
- @DefinedBy(Api.COMPILER)
- public long getColumnNumber() {
- return Diagnostic.NOPOS;
- }
- @DefinedBy(Api.COMPILER)
- public long getEndPosition() {
- return Diagnostic.NOPOS;
- }
- @DefinedBy(Api.COMPILER)
- public Kind getKind() {
- return kind;
- }
- @DefinedBy(Api.COMPILER)
- public long getLineNumber() {
- return Diagnostic.NOPOS;
- }
- @DefinedBy(Api.COMPILER)
- public String getMessage(Locale locale) {
- if (code.length() == 0)
- return (String) args[0];
- return getText(code, args); // FIXME locale
- }
- @DefinedBy(Api.COMPILER)
- public long getPosition() {
- return Diagnostic.NOPOS;
- }
- @DefinedBy(Api.COMPILER)
- public JavaFileObject getSource() {
- return null;
- }
- @DefinedBy(Api.COMPILER)
- public long getStartPosition() {
- return Diagnostic.NOPOS;
- }
- };
- }
-}
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties 2017-11-09 15:06:41.037955645 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,178 +0,0 @@
-#
-# Copyright (c) 1998, 2016, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-#
-# User errors, command line errors.
-#
-cant.create.dir=\
- The directory {0} could not be create for output.
-at.args.cant.read=\
- Can''t read command line arguments from file {1}.
-at.args.file.not.found=\
- Can''t find file {0}.
-at.args.io.exception=\
- The following I/O problem was encountered when processing an @ \
- argument on the command line: {0}.
-bad.arg=\
- Bad argument: {0}
-old.jni.mixed=\
- Can''t mix options -jni and -old. Try -help.
-old.llni.mixed=\
- Can''t mix options -old and -llni. Try -help.
-old.not.supported=\
- Option -old not supported by this version of javah.
-invalid.method.signature=\
- Invalid method signature: {0}
-jni.llni.mixed=\
- Can''t mix options -jni and -llni. Try -help.
-jni.no.stubs=\
- JNI does not require stubs, please refer to the JNI documentation.
-jni.sigerror=\
- Cannot determine signature for {0}
-dir.file.mixed=\
- Can''t mix options -d and -o. Try -help.
-no.classes.specified=\
- No classes were specified on the command line. Try -help.
-no.outputfile.specified=\
- No outputfile was specified on the command line. Try -help.
-no.outputdir.specified=\
- No output directory was specified on the command line. Try -help.
-no.classpath.specified=\
- No classpath was specified on the command line. Try -help.
-no.bootclasspath.specified=\
- No bootclasspath was specified on the command line. Try -help.
-unknown.option=\
- {0} is an illegal argument\n
-tracing.not.supported=\
- Warning: Tracing is no longer supported. Instead, use\
- -verbose:jni option of the virtual machine.
-
-main.usage=\
-Usage: \n\
-\ javah [options] \n\
-where [options] include:
-
-main.opt.o=\
-\ -o Output file (only one of -d or -o may be used)
-
-main.opt.d=\
-\ -d Output directory
-
-main.opt.v=\
-\ -v -verbose Enable verbose output
-
-main.opt.h=\
-\ -h --help -? Print this message
-
-main.opt.version=\
-\ -version Print version information
-
-main.opt.jni=\
-\ -jni Generate JNI-style header file (default)
-
-main.opt.force=\
-\ -force Always write output files
-
-main.opt.module_path=\
-\ --module-path Path from which to load application modules
-
-main.opt.upgrade_module_path=\
-\ --upgrade_module-path Path from which to load application modules
-
-main.opt.classpath=\
-\ -classpath Path from which to load classes
-
-main.opt.class_path=\
-\ --class-path Path from which to load classes
-
-main.opt.cp=\
-\ -cp Path from which to load classes
-
-main.opt.bootclasspath=\
-\ -bootclasspath Path from which to load bootstrap classes
-
-main.opt.system=\
-\ --system Specify where to find system modules
-
-main.usage.foot=\n\
-GNU-style options may use '=' instead whitespace to separate the name of an option\n\
-from its value.\n\
-\n\
-Each class must be specified by its fully qualified names, optionally\n\
-prefixed by a module name followed by '/'. Examples:\n\
-\ java.lang.Object\n\
-\ java.base/java.io.File\n\
-
-#
-# Version string.
-#
-javah.version={0} version "{1}"
-javah.fullVersion={0} full version "{1}"
-
-#
-# These should have better diagnostics.
-#
-super.class.not.found=\
- A required super class {0} could not be found.
-class.not.found=\
- Class {0} could not be found.
-io.exception=\
- Can''t recover from an I/O error with the following message: \
- {0}.
-
-#
-# Problems in the guts of javah.
-#
-encoding.iso8859_1.not.found=\
- ISO8859_1 converter was not found for output. This is \
- probably due to an error in the installation installation.
-tried.to.define.non.static=\
- Tried to generate #define for non-static field.
-jni.unknown.type=\
- An unknown type encountered (JNI).
-unknown.array.type=\
- An unknown array type encountered when generating old style headers.
-unknown.type.for.field=\
- An unknown type encountered when generating old style headers.
-unknown.type.in.method.signature=\
- An unknown type eccountered when generating old style stubs.
-
-
-err.prefix=Error:
-err.cant.use.option.for.fm=Can't use {0} option with given file manager
-err.internal.error=Internal error: {0}
-err.ioerror=IO error: {0}
-err.missing.arg=value missing for {0}
-err.no.classes.specified=no classes specified
-err.unknown.option=unknown option: {0}
-
-#
-# miscellaneous strings
-#
-javah.misc.Deprecation=\
- \nWarning:\u0020The javah tool is planned to be removed in the next major\n\
- JDK release. The tool has been superseded by the ''-h'' option added\n\
- to javac in JDK 8. Users are recommended to migrate to using the\n\
- javac ''-h'' option; see the javac man page for more information.\n
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2017-11-09 15:06:41.625981312 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,116 +0,0 @@
-#
-# Copyright (c) 1998, 2016, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-#
-# User errors, command line errors.
-#
-cant.create.dir=\u51FA\u529B\u7528\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
-at.args.cant.read=\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
-at.args.file.not.found=\u30D5\u30A1\u30A4\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-at.args.io.exception=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u306E@\u5F15\u6570\u306E\u51E6\u7406\u4E2D\u306B\u3001\u6B21\u306E\u5165\u51FA\u529B\u306E\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\u3002
-bad.arg=\u7121\u52B9\u306A\u5F15\u6570: {0}
-old.jni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-old\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-old.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-old\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-old.not.supported=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306Ejavah\u3067\u306F\u30AA\u30D7\u30B7\u30E7\u30F3-old\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-invalid.method.signature=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u30FB\u30B7\u30B0\u30CB\u30C1\u30E3: {0}
-jni.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-jni.no.stubs=JNI\u306F\u30B9\u30BF\u30D6\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093\u3002JNI\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-jni.sigerror={0}\u306E\u7F72\u540D\u3092\u5224\u5B9A\u3067\u304D\u307E\u305B\u3093
-dir.file.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-d\u3068-o\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-no.outputdir.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-no.classpath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-no.bootclasspath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-unknown.option={0}\u306F\u4E0D\u6B63\u306A\u5F15\u6570\u3067\u3059\n
-tracing.not.supported=\u8B66\u544A: \u30C8\u30EC\u30FC\u30B9\u306F\u73FE\u5728\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u304B\u308F\u308A\u306B\u3001Virtual Machine\u306E-verbose:jni\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-main.usage=\u4F7F\u7528\u65B9\u6CD5: \n javah [options] \n[options]\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002
-
-main.opt.o=\ -o \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B)
-
-main.opt.d=\ -d \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-
-main.opt.v=\ -v -verbose \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
-
-main.opt.h=\ -h --help -? \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B
-
-main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B
-
-main.opt.jni=\ -jni JNI\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
-
-main.opt.force=\ -force \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080
-
-main.opt.module_path=\ --module-path \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.upgrade_module_path=\ --upgrade_module-path \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.classpath=\ -classpath \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.class_path=\ --class-path \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.cp=\ -cp \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.bootclasspath=\ -bootclasspath \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-
-main.opt.system=\ --system \u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
-
-main.usage.foot=\nGNU\u30B9\u30BF\u30A4\u30EB\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u540D\u524D\u3068\u305D\u306E\u5024\u3092\u533A\u5207\u308B\u305F\u3081\u306B\u7A7A\u767D\u3067\u306F\u306A\u304F'='\u3092\n\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u5404\u30AF\u30E9\u30B9\u306F\u3001\u305D\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u306E\n\u63A5\u982D\u8F9E\u306B\u7D9A\u3051\u3066'/'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B:\n java.lang.Object\n java.base/java.io.File\n
-#
-# Version string.
-#
-javah.version={0}\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
-javah.fullVersion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
-
-#
-# These should have better diagnostics.
-#
-super.class.not.found=\u8981\u6C42\u3055\u308C\u305F\u30B9\u30FC\u30D1\u30FC\u30FB\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-class.not.found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-io.exception=\u30E1\u30C3\u30BB\u30FC\u30B8{0}\u306E\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304B\u3089\u56DE\u5FA9\u3067\u304D\u307E\u305B\u3093\u3002
-
-#
-# Problems in the guts of javah.
-#
-encoding.iso8859_1.not.found=\u51FA\u529B\u7528\u306EISO8859_1\u30B3\u30F3\u30D0\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-tried.to.define.non.static=static\u3067\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9\u306B#define\u3092\u751F\u6210\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-jni.unknown.type=\u4E0D\u660E\u306A\u578B\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F(JNI)\u3002
-unknown.array.type=\u53E4\u3044\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u3092\u751F\u6210\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u4E0D\u660E\u306A\u914D\u5217\u306E\u578B\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-unknown.type.for.field=\u53E4\u3044\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u3092\u751F\u6210\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u4E0D\u660E\u306A\u578B\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-unknown.type.in.method.signature=\u53E4\u3044\u5F62\u5F0F\u306E\u30B9\u30BF\u30D6\u3092\u751F\u6210\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u4E0D\u660E\u306A\u578B\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-
-
-err.prefix=\u30A8\u30E9\u30FC:
-err.cant.use.option.for.fm=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0}
-err.ioerror=\u5165\u51FA\u529B\u30A8\u30E9\u30FC: {0}
-err.missing.arg={0}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
-err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-
-#
-# miscellaneous strings
-#
-javah.misc.Deprecation=\n\u8B66\u544A: javah\u30C4\u30FC\u30EB\u306F\u6B21\u56DE\u306EJDK\u30E1\u30B8\u30E3\u30FC\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n\u3053\u306E\u30C4\u30FC\u30EB\u306FJDK 8\u3067javac\u306B\u8FFD\u52A0\u3055\u308C\u305F''-h''\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u7F6E\u304D\u63DB\u3048\u3089\u308C\u307E\u3057\u305F\u3002\n\u30E6\u30FC\u30B6\u30FC\u306Fjavac ''-h''\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u3001javac man\u30DA\u30FC\u30B8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties 2017-11-09 15:06:42.234007852 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,116 +0,0 @@
-#
-# Copyright (c) 1998, 2016, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-#
-# User errors, command line errors.
-#
-cant.create.dir=\u65E0\u6CD5\u4E3A\u8F93\u51FA\u521B\u5EFA\u76EE\u5F55 {0}\u3002
-at.args.cant.read=\u65E0\u6CD5\u4ECE\u6587\u4EF6{1}\u4E2D\u8BFB\u53D6\u547D\u4EE4\u884C\u53C2\u6570\u3002
-at.args.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6{0}\u3002
-at.args.io.exception=\u5904\u7406\u547D\u4EE4\u884C\u4E2D\u7684 @ \u53C2\u6570\u65F6, \u9047\u5230\u4EE5\u4E0B I/O \u95EE\u9898: {0}\u3002
-bad.arg=\u9519\u8BEF\u53C2\u6570: {0}
-old.jni.mixed=\u4E0D\u80FD\u6DF7\u7528\u9009\u9879 -jni \u548C -old\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-old.llni.mixed=\u4E0D\u80FD\u6DF7\u7528\u9009\u9879 -old \u548C -llni\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-old.not.supported=\u6B64\u7248\u672C\u7684 javah \u4E0D\u652F\u6301\u9009\u9879 -old\u3002
-invalid.method.signature=\u65E0\u6548\u7684\u65B9\u6CD5\u7B7E\u540D: {0}
-jni.llni.mixed=\u4E0D\u80FD\u6DF7\u7528\u9009\u9879 -jni \u548C -llni\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-jni.no.stubs=JNI \u4E0D\u9700\u8981\u5B58\u6839, \u8BF7\u53C2\u9605 JNI \u6587\u6863\u3002
-jni.sigerror=\u65E0\u6CD5\u786E\u5B9A{0}\u7684\u7B7E\u540D
-dir.file.mixed=\u4E0D\u80FD\u6DF7\u7528\u9009\u9879 -d \u548C -o\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-no.classes.specified=\u672A\u5728\u547D\u4EE4\u884C\u4E2D\u6307\u5B9A\u4EFB\u4F55\u7C7B\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-no.outputfile.specified=\u672A\u5728\u547D\u4EE4\u884C\u4E2D\u6307\u5B9A\u4EFB\u4F55\u8F93\u51FA\u6587\u4EF6\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-no.outputdir.specified=\u672A\u5728\u547D\u4EE4\u884C\u4E2D\u6307\u5B9A\u4EFB\u4F55\u8F93\u51FA\u76EE\u5F55\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-no.classpath.specified=\u672A\u5728\u547D\u4EE4\u884C\u4E2D\u6307\u5B9A\u4EFB\u4F55\u7C7B\u8DEF\u5F84\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-no.bootclasspath.specified=\u672A\u5728\u547D\u4EE4\u884C\u4E2D\u6307\u5B9A\u4EFB\u4F55\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 -help\u3002
-unknown.option={0}\u662F\u975E\u6CD5\u53C2\u6570\n
-tracing.not.supported=\u8B66\u544A: \u4E0D\u518D\u652F\u6301\u8DDF\u8E2A\u3002\u8BF7\u4F7F\u7528\u865A\u62DF\u673A\u7684 -verbose:jni \u9009\u9879\u3002
-
-main.usage=\u7528\u6CD5: \n javah [options] \n\u5176\u4E2D, [options] \u5305\u62EC:
-
-main.opt.o=\ -o \u8F93\u51FA\u6587\u4EF6 (\u53EA\u80FD\u4F7F\u7528 -d \u6216 -o \u4E4B\u4E00)
-
-main.opt.d=\ -d \u8F93\u51FA\u76EE\u5F55
-
-main.opt.v=\ -v -verbose \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA
-
-main.opt.h=\ -h --help -? \u8F93\u51FA\u6B64\u6D88\u606F
-
-main.opt.version=\ -version \u8F93\u51FA\u7248\u672C\u4FE1\u606F
-
-main.opt.jni=\ -jni \u751F\u6210 JNI \u6837\u5F0F\u7684\u6807\u5934\u6587\u4EF6 (\u9ED8\u8BA4\u503C)
-
-main.opt.force=\ -force \u59CB\u7EC8\u5199\u5165\u8F93\u51FA\u6587\u4EF6
-
-main.opt.module_path=\ --module-path <\u8DEF\u5F84> \u4ECE\u4E2D\u52A0\u8F7D\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u8DEF\u5F84
-
-main.opt.upgrade_module_path=\ --upgrade_module-path <\u8DEF\u5F84> \u4ECE\u4E2D\u52A0\u8F7D\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u8DEF\u5F84
-
-main.opt.classpath=\ -classpath \u4ECE\u4E2D\u52A0\u8F7D\u7C7B\u7684\u8DEF\u5F84
-
-main.opt.class_path=\ --class-path <\u8DEF\u5F84> \u4ECE\u4E2D\u52A0\u8F7D\u7C7B\u7684\u8DEF\u5F84
-
-main.opt.cp=\ -cp \u4ECE\u4E2D\u52A0\u8F7D\u7C7B\u7684\u8DEF\u5F84
-
-main.opt.bootclasspath=\ -bootclasspath \u4ECE\u4E2D\u52A0\u8F7D\u5F15\u5BFC\u7C7B\u7684\u8DEF\u5F84
-
-main.opt.system=\ --system \u6307\u5B9A\u67E5\u627E\u7CFB\u7EDF\u6A21\u5757\u7684\u4F4D\u7F6E
-
-main.usage.foot=\nGNU \u6837\u5F0F\u7684\u9009\u9879\u53EF\u4F7F\u7528 '=' (\u800C\u975E\u7A7A\u767D) \u6765\u5206\u9694\u9009\u9879\u540D\u79F0\n\u53CA\u5176\u503C\u3002\n\n\u6BCF\u4E2A\u7C7B\u5FC5\u987B\u7531\u5176\u5168\u9650\u5B9A\u540D\u79F0\u6307\u5B9A, \n\u53EF\u4EE5\u9009\u62E9\u6027\u5730\u4F7F\u7528\u6A21\u5757\u540D\u540E\u8DDF '/' \u4F5C\u4E3A\u524D\u7F00\u3002\u793A\u4F8B:\n java.lang.Object\n java.base/java.io.File\n
-#
-# Version string.
-#
-javah.version={0}\u7248\u672C "{1}"
-javah.fullVersion={0}\u5B8C\u6574\u7248\u672C "{1}"
-
-#
-# These should have better diagnostics.
-#
-super.class.not.found=\u627E\u4E0D\u5230\u6240\u9700\u7684\u8D85\u7C7B{0}\u3002
-class.not.found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
-io.exception=\u65E0\u6CD5\u4ECE I/O \u9519\u8BEF\u4E2D\u6062\u590D, \u6D88\u606F\u4E3A: {0}\u3002
-
-#
-# Problems in the guts of javah.
-#
-encoding.iso8859_1.not.found=\u627E\u4E0D\u5230\u7528\u4E8E\u8F93\u51FA\u7684 ISO8859_1 \u8F6C\u6362\u5668\u3002\u8FD9\u53EF\u80FD\u662F\u56E0\u4E3A\u5B89\u88C5\u8FC7\u7A0B\u4E2D\u51FA\u73B0\u4E86\u9519\u8BEF\u3002
-tried.to.define.non.static=\u5C1D\u8BD5\u4E3A\u975E\u9759\u6001\u5B57\u6BB5\u751F\u6210 #define\u3002
-jni.unknown.type=\u9047\u5230\u672A\u77E5\u7C7B\u578B (JNI)\u3002
-unknown.array.type=\u751F\u6210\u65E7\u6837\u5F0F\u7684\u6807\u5934\u65F6\u9047\u5230\u672A\u77E5\u7684\u6570\u7EC4\u7C7B\u578B\u3002
-unknown.type.for.field=\u751F\u6210\u65E7\u6837\u5F0F\u7684\u6807\u5934\u65F6\u9047\u5230\u672A\u77E5\u7684\u7C7B\u578B\u3002
-unknown.type.in.method.signature=\u751F\u6210\u65E7\u6837\u5F0F\u7684\u5B58\u6839\u65F6\u9047\u5230\u672A\u77E5\u7684\u7C7B\u578B\u3002
-
-
-err.prefix=\u9519\u8BEF:
-err.cant.use.option.for.fm=\u4E0D\u80FD\u5C06{0}\u9009\u9879\u4E0E\u7ED9\u5B9A\u7684\u6587\u4EF6\u7BA1\u7406\u5668\u4E00\u8D77\u4F7F\u7528
-err.internal.error=\u5185\u90E8\u9519\u8BEF: {0}
-err.ioerror=IO \u9519\u8BEF: {0}
-err.missing.arg={0}\u7F3A\u5C11\u503C
-err.no.classes.specified=\u672A\u6307\u5B9A\u7C7B
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-
-#
-# miscellaneous strings
-#
-javah.misc.Deprecation=\n\u8B66\u544A: \u5DF2\u8BA1\u5212\u5728\u4E0B\u4E00\u4E2A JDK \u4E3B\u53D1\u884C\u7248\u4E2D\u5220\u9664 javah\n\u5DE5\u5177\u3002\u8BE5\u5DE5\u5177\u5728 JDK 8 \u4E2D\u5DF2\u7531\u6DFB\u52A0\u5230 javac \u7684\n''-h'' \u9009\u9879\u53D6\u4EE3\u3002\u5EFA\u8BAE\u7528\u6237\u6539\u4E3A\u4F7F\u7528 javac ''-h''\n\u9009\u9879; \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u67E5\u770B javac \u5E2E\u52A9\u9875\u3002\n
--- old/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template 2017-11-09 15:06:42.774031423 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2005, 2010, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-jdk=$(JDK_VERSION)
-full=$(FULL_VERSION)
-release=$(RELEASE)
--- old/test/langtools/tools/javac/T8152360/DeprecateJavahTest.java 2017-11-09 15:06:43.270053074 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2016, 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 8152360
- * @summary deprecate javah
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.main
- * jdk.compiler/com.sun.tools.javah
- * @build toolbox.ToolBox toolbox.JavahTask
- * @run main DeprecateJavahTest
- */
-
-import toolbox.JavahTask;
-import toolbox.Task;
-import toolbox.ToolBox;
-
-public class DeprecateJavahTest {
- public static void main(String... args) throws Exception {
- new DeprecateJavahTest().run();
- }
-
- ToolBox tb = new ToolBox();
-
- void printDeprecationWarning() throws Exception {
- String output = new JavahTask(tb)
- .options("-version")
- .run()
- .writeAll()
- .getOutput(Task.OutputKind.DIRECT);
-
- if (!output.contains(
- "Warning: The javah tool is planned to be removed in the next major\n" +
- "JDK release. The tool has been superseded by the '-h' option added\n" +
- "to javac in JDK 8. Users are recommended to migrate to using the\n" +
- "javac '-h' option; see the javac man page for more information.")) {
- throw new Exception("test failed");
- }
- }
-
- void dontPrintDeprecationWarning() throws Exception {
- String output = new JavahTask(tb)
- .options("-version", "-XDsuppress-tool-removal-message")
- .run()
- .writeAll()
- .getOutput(Task.OutputKind.DIRECT);
-
- if (!output.startsWith("javah version")) {
- throw new Exception("test failed");
- }
- }
-
- void run() throws Exception {
- printDeprecationWarning();
- dontPrintDeprecationWarning();
- }
-}
--- old/test/langtools/tools/javac/nativeHeaders/javahComparison/CompareTest.java 2017-11-09 15:06:43.842078042 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2007, 2016, 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 7150368 8003412 8000407 8031545
- * @summary javac should include basic ability to generate native headers
- * @modules jdk.compiler/com.sun.tools.javah
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class CompareTest {
- public static void main(String... args) throws Exception {
- new CompareTest().run();
- }
-
- void run() throws Exception {
- File srcDir = new File(System.getProperty("test.src"));
- File classesDir = new File("classes");
- classesDir.mkdirs();
- File javacHeaders = new File("headers.javac");
- javacHeaders.mkdirs();
- File javahHeaders = new File("headers.javah");
- javahHeaders.mkdirs();
-
- List javacArgs = new ArrayList();
- javacArgs.add("-d");
- javacArgs.add(classesDir.getPath());
- javacArgs.add("-h");
- javacArgs.add(javacHeaders.getPath());
- javacArgs.add("-XDjavah:full");
-
- for (File f: srcDir.listFiles()) {
- if (f.getName().matches("TestClass[0-9]+\\.java")) {
- sourceFileCount++;
- javacArgs.add(f.getPath());
- }
- }
-
- int rc = com.sun.tools.javac.Main.compile(javacArgs.toArray(new String[javacArgs.size()]));
- if (rc != 0)
- throw new Exception("javac failed; rc=" + rc);
-
- List javahArgs = new ArrayList();
- javahArgs.add("-d");
- javahArgs.add(javahHeaders.getPath());
-
- for (File f: classesDir.listFiles()) {
- if (f.getName().endsWith(".class")) {
- javahArgs.add(inferBinaryName(f));
- }
- }
-
- PrintWriter pw = new PrintWriter(System.out, true);
- rc = com.sun.tools.javah.Main.run(javahArgs.toArray(new String[javahArgs.size()]), pw);
- if (rc != 0)
- throw new Exception("javah failed; rc=" + rc);
-
- compare(javahHeaders, javacHeaders);
-
- int javahHeaderCount = javahHeaders.list().length;
- int javacHeaderCount = javacHeaders.list().length;
-
- System.out.println(sourceFileCount + " .java files found");
- System.out.println(javacHeaderCount + " .h files generated by javac");
- System.out.println(javahHeaderCount + " .h files generated by javah");
- System.out.println(compareCount + " header files compared");
-
- if (javacHeaderCount != javahHeaderCount || javacHeaderCount != compareCount)
- error("inconsistent counts");
-
- if (errors > 0)
- throw new Exception(errors + " errors occurred");
- }
-
- String inferBinaryName(File file) {
- String name = file.getName();
- return name.substring(0, name.length() - ".class".length()).replace("$", ".");
- }
-
- /** Compare two directories.
- * @param f1 The golden directory
- * @param f2 The directory to be compared
- */
- void compare(File f1, File f2) {
- compare(f1, f2, null);
- }
-
- /** Compare two files or directories
- * @param f1 The golden directory
- * @param f2 The directory to be compared
- * @param p An optional path identifying a file within the two directories
- */
- void compare(File f1, File f2, String p) {
- File f1p = (p == null ? f1 : new File(f1, p));
- File f2p = (p == null ? f2 : new File(f2, p));
- if (f1p.isDirectory() && f2p.isDirectory()) {
- Set children = new HashSet();
- children.addAll(Arrays.asList(f1p.list()));
- children.addAll(Arrays.asList(f2p.list()));
- for (String c: children) {
- compare(f1, f2, new File(p, c).getPath()); // null-safe for p
- }
- }
- else if (f1p.isFile() && f2p.isFile()) {
- System.out.println("checking " + p);
- compareCount++;
- String s1 = read(f1p);
- String s2 = read(f2p);
- if (!s1.equals(s2)) {
- System.out.println("File: " + f1p + "\n" + s1);
- System.out.println("File: " + f2p + "\n" + s2);
- error("Files differ: " + f1p + " " + f2p);
- }
- }
- else if (f1p.exists() && !f2p.exists())
- error("Only in " + f1 + ": " + p);
- else if (f2p.exists() && !f1p.exists())
- error("Only in " + f2 + ": " + p);
- else
- error("Files differ: " + f1p + " " + f2p);
- }
-
- private String read(File f) {
- try {
- return new String(Files.readAllBytes(f.toPath()));
- } catch (IOException e) {
- error("error reading " + f + ": " + e);
- return "";
- }
- }
-
- private void error(String msg) {
- System.out.println(msg);
- errors++;
- }
-
- private int errors;
- private int compareCount;
- private int sourceFileCount;
-}
--- old/test/langtools/tools/javah/4942232/ParamClassTest.java 2017-11-09 15:06:44.426103534 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2010, 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.
- */
-
-public class ParamClassTest {
- static {
- System.loadLibrary("Test");
- }
-
- public native void method(Param s);
-
- public static void main(String[] a) {
- }
-}
-
-class Param {
-}
--- old/test/langtools/tools/javah/4942232/Test.java 2017-11-09 15:06:45.006128851 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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 4942232
- * @summary missing param class processes without error
- * @modules jdk.compiler/com.sun.tools.javah
- * @build ParamClassTest Test
- * @run main Test
- */
-
-import java.io.*;
-import java.util.*;
-
-public class Test {
- public static void main(String... args) throws Exception {
- new Test().run();
- }
-
- void run() throws Exception {
- File testSrc = new File(System.getProperty("test.src"));
- File testClasses = new File(System.getProperty("test.classes"));
-
- // standard use of javah on valid class file
- String[] test1Args = {
- "-d", mkdir("test1/out").getPath(),
- "-classpath", testClasses.getPath(),
- "ParamClassTest"
- };
- test(test1Args, 0);
-
- // extended use of javah on valid source file
- String[] test2Args = {
- "-d", mkdir("test2/out").getPath(),
- "-classpath", testSrc.getPath(),
- "ParamClassTest"
- };
- test(test2Args, 0);
-
- // javah on class file with missing referents
- File test3Classes = mkdir("test3/classes");
- copy(new File(testClasses, "ParamClassTest.class"), test3Classes);
- String[] test3Args = {
- "-d", mkdir("test3/out").getPath(),
- "-classpath", test3Classes.getPath(),
- "ParamClassTest"
- };
- test(test3Args, 1);
-
- // javah on source file with missing referents
- File test4Src = mkdir("test4/src");
- String paramClassTestSrc = readFile(new File(testSrc, "ParamClassTest.java"));
- writeFile(new File(test4Src, "ParamClassTest.java"),
- paramClassTestSrc.replaceAll("class Param \\{\\s+\\}", ""));
- String[] test4Args = {
- "-d", mkdir("test4/out").getPath(),
- "-classpath", test4Src.getPath(),
- "ParamClassTest"
- };
- test(test4Args, 15);
-
- if (errors > 0)
- throw new Exception(errors + " errors occurred");
- }
-
- void test(String[] args, int expect) {
- System.err.println("test: " + Arrays.asList(args));
- int rc = javah(args);
- if (rc != expect)
- error("Unexpected return code: " + rc + "; expected: " + expect);
- }
-
- int javah(String... args) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- int rc = com.sun.tools.javah.Main.run(args, pw);
- pw.close();
- String out = sw.toString();
- if (!out.isEmpty())
- System.err.println(out);
- return rc;
- }
-
- File mkdir(String path) {
- File f = new File(path);
- f.mkdirs();
- return f;
- }
-
- void copy(File from, File to) throws IOException {
- if (to.isDirectory())
- to = new File(to, from.getName());
- try (DataInputStream in = new DataInputStream(new FileInputStream(from));
- FileOutputStream out = new FileOutputStream(to)) {
- byte[] buf = new byte[(int) from.length()];
- in.readFully(buf);
- out.write(buf);
- }
- }
-
- String readFile(File f) throws IOException {
- try (DataInputStream in = new DataInputStream(new FileInputStream(f))) {
- byte[] buf = new byte[(int) f.length()];
- in.readFully(buf);
- return new String(buf);
- }
- }
-
- void writeFile(File f, String body) throws IOException {
- try (FileWriter out = new FileWriter(f)) {
- out.write(body);
- }
- }
-
- void error(String msg) {
- System.err.println(msg);
- errors++;
- }
-
- int errors;
-}
--- old/test/langtools/tools/javah/6257087/T6257087.java 2017-11-09 15:06:45.486149804 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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 6257087
- * @summary javah doesn't produce proper signatures for inner class native methods
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.main
- * jdk.compiler/com.sun.tools.javah
- * @build toolbox.ToolBox toolbox.JavahTask
- * @run main T6257087
- */
-
-import java.util.List;
-
-import toolbox.JavahTask;
-import toolbox.ToolBox;
-
-public class T6257087 {
-
- private static final String fooBarGoldenFile =
- "/* DO NOT EDIT THIS FILE - it is machine generated */\n" +
- "#include \n" +
- "/* Header for class foo_bar */\n" +
- "\n" +
- "#ifndef _Included_foo_bar\n" +
- "#define _Included_foo_bar\n" +
- "#ifdef __cplusplus\n" +
- "extern \"C\" {\n" +
- "#endif\n" +
- "/*\n" +
- " * Class: foo_bar\n" +
- " * Method: aardvark\n" +
- " * Signature: ()V\n" +
- " */\n" +
- "JNIEXPORT void JNICALL Java_foo_00024bar_aardvark\n" +
- " (JNIEnv *, jobject);\n" +
- "\n" +
- "#ifdef __cplusplus\n" +
- "}\n" +
- "#endif\n" +
- "#endif";
-
- public static void main(String[] args) throws Exception {
- ToolBox tb = new ToolBox();
- new JavahTask(tb)
- .classpath(ToolBox.testClasses)
- .classes("foo")
- .run();
-
- List fooBarFile = tb.readAllLines("foo_bar.h");
- tb.checkEqual(fooBarFile, tb.split(fooBarGoldenFile, "\n"));
- }
-
-}
-
-class foo {
- class bar {
- public native void aardvark();
- }
-}
--- old/test/langtools/tools/javah/6572945/T6572945.java 2017-11-09 15:06:46.034173724 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2007, 2016, 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 6572945
- * @summary rewrite javah as an annotation processor, instead of as a doclet
- * @modules jdk.compiler/com.sun.tools.javah
- * @build TestClass1 TestClass2 TestClass3
- * @run main T6572945
- */
-
-import java.io.*;
-import java.util.*;
-import com.sun.tools.javah.Main;
-
-public class T6572945
-{
- static File testSrc = new File(System.getProperty("test.src", "."));
- static File testClasses = new File(System.getProperty("test.classes", "."));
- static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
-
- public static void main(String... args)
- throws IOException, InterruptedException
- {
- boolean ok = new T6572945().run(args);
- if (!ok)
- throw new Error("Test Failed");
- }
-
- public boolean run(String[] args)
- throws IOException, InterruptedException
- {
- if (args.length == 1)
- jdk = new File(args[0]);
-
- test("-o", "jni.file.1", "-jni", "TestClass1");
- test("-o", "jni.file.2", "-jni", "TestClass1", "TestClass2");
- test("-d", "jni.dir.1", "-jni", "TestClass1", "TestClass2");
- test("-o", "jni.file.3", "-jni", "TestClass3");
-
- // The following tests are disabled because llni support has been
- // discontinued, and because bugs in old javah means that character
- // for character testing against output from old javah does not work.
- // In fact, the LLNI impl in new javah is actually better than the
- // impl in old javah because of a couple of significant bug fixes.
-
-// test("-o", "llni.file.1", "-llni", "TestClass1");
-// test("-o", "llni.file.2", "-llni", "TestClass1", "TestClass2");
-// test("-d", "llni.dir.1", "-llni", "TestClass1", "TestClass2");
-// test("-o", "llni.file.3", "-llni", "TestClass3");
-
- return (errors == 0);
- }
-
- void test(String... args)
- throws IOException, InterruptedException
- {
- String[] cp_args = new String[args.length + 2];
- cp_args[0] = "-classpath";
- cp_args[1] = testClasses.getPath();
- System.arraycopy(args, 0, cp_args, 2, args.length);
-
- if (jdk != null)
- init(cp_args);
-
- File out = null;
- for (int i = 0; i < args.length; i++) {
- if (args[i].equals("-o")) {
- out = new File(args[++i]);
- break;
- } else if (args[i].equals("-d")) {
- out = new File(args[++i]);
- out.mkdirs();
- break;
- }
- }
-
- try {
- System.out.println("test: " + Arrays.asList(cp_args));
-
-// // Uncomment and use the following lines to execute javah via the
-// // command line -- for example, to run old javah and set up the golden files
-// List cmd = new ArrayList();
-// File javaHome = new File(System.getProperty("java.home"));
-// if (javaHome.getName().equals("jre"))
-// javaHome = javaHome.getParentFile();
-// File javah = new File(new File(javaHome, "bin"), "javah");
-// cmd.add(javah.getPath());
-// cmd.addAll(Arrays.asList(cp_args));
-// ProcessBuilder pb = new ProcessBuilder(cmd);
-// pb.redirectErrorStream(true);
-// pb.start();
-// Process p = pb.start();
-// String line;
-// BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-// while ((line = in.readLine()) != null)
-// System.err.println(line);
-// in.close();
-// int rc = p.waitFor();
-
- // Use new javah
- PrintWriter err = new PrintWriter(System.err, true);
- int rc = Main.run(cp_args, err);
-
- if (rc != 0) {
- error("javah failed: rc=" + rc);
- return;
- }
-
- // The golden files use the LL suffix for long constants, which
- // is used on Linux and Solaris. On Windows, the suffix is i64,
- // so compare will update the golden files on the fly before the
- // final comparison.
- compare(new File(new File(testSrc, "gold"), out.getName()), out);
- } catch (Throwable t) {
- t.printStackTrace();
- error("javah threw exception");
- }
- }
-
- void init(String[] args) throws IOException, InterruptedException {
- String[] cmdArgs = new String[args.length + 1];
- cmdArgs[0] = new File(new File(jdk, "bin"), "javah").getPath();
- System.arraycopy(args, 0, cmdArgs, 1, args.length);
-
- System.out.println("init: " + Arrays.asList(cmdArgs));
-
- ProcessBuilder pb = new ProcessBuilder(cmdArgs);
- pb.directory(new File(testSrc, "gold"));
- pb.redirectErrorStream(true);
- Process p = pb.start();
- BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
- String line;
- while ((line = in.readLine()) != null)
- System.out.println("javah: " + line);
- int rc = p.waitFor();
- if (rc != 0)
- error("javah: exit code " + rc);
- }
-
- /** Compare two directories.
- * @param f1 The golden directory
- * @param f2 The directory to be compared
- */
- void compare(File f1, File f2) {
- compare(f1, f2, null);
- }
-
- /** Compare two files or directories
- * @param f1 The golden directory
- * @param f2 The directory to be compared
- * @param p An optional path identifying a file within the two directories
- */
- void compare(File f1, File f2, String p) {
- File f1p = (p == null ? f1 : new File(f1, p));
- File f2p = (p == null ? f2 : new File(f2, p));
- System.out.println("compare " + f1p + " " + f2p);
- if (f1p.isDirectory() && f2p.isDirectory()) {
- Set children = new HashSet();
- children.addAll(Arrays.asList(f1p.list()));
- children.addAll(Arrays.asList(f2p.list()));
- for (String c: children) {
- compare(f1, f2, new File(p, c).getPath()); // null-safe for p
- }
- }
- else if (f1p.isFile() && f2p.isFile()) {
- String s1 = read(f1p);
- if (isWindows) {
- // f1/s1 is the golden file
- // on Windows, long constants use the i64 suffix, not LL
- s1 = s1.replaceAll("( [0-9]+)LL\n", "$1i64\n");
- }
- String s2 = read(f2p);
- if (!s1.equals(s2)) {
- System.out.println("File: " + f1p + "\n" + s1);
- System.out.println("File: " + f2p + "\n" + s2);
- error("Files differ: " + f1p + " " + f2p);
- }
- }
- else if (f1p.exists() && !f2p.exists())
- error("Only in " + f1 + ": " + p);
- else if (f2p.exists() && !f1p.exists())
- error("Only in " + f2 + ": " + p);
- else
- error("Files differ: " + f1p + " " + f2p);
- }
-
- private String read(File f) {
- try {
- BufferedReader in = new BufferedReader(new FileReader(f));
- try {
- StringBuilder sb = new StringBuilder((int) f.length());
- String line;
- while ((line = in.readLine()) != null) {
- sb.append(line);
- sb.append("\n");
- }
- return sb.toString();
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- }
- }
- } catch (IOException e) {
- error("error reading " + f + ": " + e);
- return "";
- }
- }
-
-
- private void error(String msg) {
- System.out.println(msg);
- errors++;
- }
-
- private int errors;
- private File jdk;
-}
--- old/test/langtools/tools/javah/6572945/TestClass1.java 2017-11-09 15:06:46.622199390 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- */
-
-import java.util.List;
-
-public class TestClass1 {
- // simple types
- byte b;
- short s;
- int i;
- long l;
- float f;
- double d;
- Object o;
- String t;
- List g;
-
- // constants
- static final byte bc = 0;
- static final short sc = 0;
- static final int ic = 0;
- static final long lc = 0;
- static final float fc = 0;
- static final double dc = 0;
- static final Object oc = null;
- static final String tc = "";
- static final List gc = null;
-
- // simple arrays
- byte[] ba;
- short[] sa; // not handled corrected by javah v6
- int[] ia;
- long[] la;
- float[] fa;
- double[] da;
- Object[] oa;
- String[] ta;
- List[] ga;
-
- // multidimensional arrays
- byte[][] baa;
- short[][] saa;
- int[][] iaa;
- long[][] laa;
- float[][] faa;
- double[][] daa;
- Object[][] oaa;
- String[][] taa;
- List[] gaa;
-
- // simple Java methods
- byte bm() { return 0; }
- short sm() { return 0; }
- int im() { return 0; }
- long lm() { return 0; }
- float fm() { return 0; }
- double dm() { return 0; }
- Object om() { return null; }
- String tm() { return ""; }
- List gm() { return null; }
- void vm() { }
- byte[] bam() { return null; }
- short[] sam() { return null; }
- int[] iam() { return null; }
- long[] lam() { return null; }
- float[] fam() { return null; }
- double[] dam() { return null; }
- Object[] oam() { return null; }
- String[] tam() { return null; }
- List[] gam() { return null; }
- byte[][] baam() { return null; }
- short[][] saam() { return null; }
- int[][] iaam() { return null; }
- long[][] laam() { return null; }
- float[][] faam() { return null; }
- double[][] daam() { return null; }
- Object[][] oaam() { return null; }
- String[][] taam() { return null; }
- List[] gaam() { return null; }
-
- // simple native methods
- native byte bmn();
- native short smn();
- native int imn();
- native long lmn();
- native float fmn();
- native double dmn();
- native Object omn();
- native String tmn();
- native List gmn();
- native void vmn();
- native byte[] bamn();
- native short[] samn();
- native int[] iamn();
- native long[] lamn();
- native float[] famn();
- native double[] damn();
- native Object[] oamn();
- native String[] tamn();
- native List[] gamn();
- native byte[][] baamn();
- native short[][] saamn();
- native int[][] iaamn();
- native long[][] laamn();
- native float[][] faamn();
- native double[][] daamn();
- native Object[][] oaamn();
- native String[][] taamn();
- native List[] gaamn();
-
- // overloaded Java methods
- byte bm1() { return 0; }
- short sm1() { return 0; }
- int im1() { return 0; }
- long lm1() { return 0; }
- float fm1() { return 0; }
- double dm1() { return 0; }
- Object om1() { return null; }
- String tm1() { return ""; }
- List gm1() { return null; }
- void vm1() { }
-
- byte bm2(int i) { return 0; }
- short sm2(int i) { return 0; }
- int im2(int i) { return 0; }
- long lm2(int i) { return 0; }
- float fm2(int i) { return 0; }
- double dm2(int i) { return 0; }
- Object om2(int i) { return null; }
- String tm2(int i) { return ""; }
- List gm2(int i) { return null; }
- void vm2(int i) { }
-
- // overloaded native methods
- native byte bmn1();
- native short smn1();
- native int imn1();
- native long lmn1();
- native float fmn1();
- native double dmn1();
- native Object omn1();
- native String tmn1();
- native List gmn1();
- native void vmn1();
-
- native byte bmn2(int i);
- native short smn2(int i);
- native int imn2(int i);
- native long lmn2(int i);
- native float fmn2(int i);
- native double dmn2(int i);
- native Object omn2(int i);
- native String tmn2(int i);
- native List gmn2(int i);
- native void vmn2(int i);
-
- // arg types for Java methods
- void mb(byte b) { }
- void ms(short s) { }
- void mi(int i) { }
- void ml(long l) { }
- void mf(float f) { }
- void md(double d) { }
- void mo(Object o) { }
- void mt(String t) { }
- void mg(List g) { }
-
- // arg types for native methods
- native void mbn(byte b);
- native void msn(short s);
- native void min(int i);
- native void mln(long l);
- native void mfn(float f);
- native void mdn(double d);
- native void mon(Object o);
- native void mtn(String t);
- native void mgn(List g);
-
- static class Inner1 {
- // simple types
- byte b;
- short s;
- int i;
- long l;
- float f;
- double d;
- Object o;
- String t;
- List g;
-
- // constants
- static final byte bc = 0;
- static final short sc = 0;
- static final int ic = 0;
- static final long lc = 0;
- static final float fc = 0;
- static final double dc = 0;
- static final Object oc = null;
- static final String tc = "";
- static final List gc = null;
-
- // simple arrays
- byte[] ba;
- // short[] sa; // not handled corrected by javah v6
- int[] ia;
- long[] la;
- float[] fa;
- double[] da;
- Object[] oa;
- String[] ta;
- List[] ga;
-
- // multidimensional arrays
- byte[][] baa;
- short[][] saa;
- int[][] iaa;
- long[][] laa;
- float[][] faa;
- double[][] daa;
- Object[][] oaa;
- String[][] taa;
- List[] gaa;
-
- // simple Java methods
- byte bm() { return 0; }
- short sm() { return 0; }
- int im() { return 0; }
- long lm() { return 0; }
- float fm() { return 0; }
- double dm() { return 0; }
- Object om() { return null; }
- String tm() { return ""; }
- List gm() { return null; }
- void vm() { }
-
- // simple native methods
- native byte bmn();
- native short smn();
- native int imn();
- native long lmn();
- native float fmn();
- native double dmn();
- native Object omn();
- native String tmn();
- native List gmn();
- native void vmn();
-
- // overloaded Java methods
- byte bm1() { return 0; }
- short sm1() { return 0; }
- int im1() { return 0; }
- long lm1() { return 0; }
- float fm1() { return 0; }
- double dm1() { return 0; }
- Object om1() { return null; }
- String tm1() { return ""; }
- List gm1() { return null; }
- void vm1() { }
-
- byte bm2(int i) { return 0; }
- short sm2(int i) { return 0; }
- int im2(int i) { return 0; }
- long lm2(int i) { return 0; }
- float fm2(int i) { return 0; }
- double dm2(int i) { return 0; }
- Object om2(int i) { return null; }
- String tm2(int i) { return ""; }
- List gm2(int i) { return null; }
- void vm2(int i) { }
-
- // overloaded native methods
- native byte bmn1();
- native short smn1();
- native int imn1();
- native long lmn1();
- native float fmn1();
- native double dmn1();
- native Object omn1();
- native String tmn1();
- native List gmn1();
- native void vmn1();
-
- native byte bmn2(int i);
- native short smn2(int i);
- native int imn2(int i);
- native long lmn2(int i);
- native float fmn2(int i);
- native double dmn2(int i);
- native Object omn2(int i);
- native String tmn2(int i);
- native List gmn2(int i);
- native void vmn2(int i);
-
- // arg types for Java methods
- void mb(byte b) { }
- void ms(short s) { }
- void mi(int i) { }
- void ml(long l) { }
- void mf(float f) { }
- void md(double d) { }
- void mo(Object o) { }
- void mt(String t) { }
- void mg(List g) { }
-
- // arg types for native methods
- native void mbn(byte b);
- native void msn(short s);
- native void min(int i);
- native void mln(long l);
- native void mfn(float f);
- native void mdn(double d);
- native void mon(Object o);
- native void mtn(String t);
- native void mgn(List g);
- }
-
- class Inner2 {
- // simple types
- byte b;
- short s;
- int i;
- long l;
- float f;
- double d;
- Object o;
- String t;
- List g;
-
- // constants
- static final byte bc = 0;
- static final short sc = 0;
- static final int ic = 0;
- static final long lc = 0;
- static final float fc = 0;
- static final double dc = 0;
- //static final Object oc = null;
- static final String tc = "";
- //static final List gc = null;
-
- // simple arrays
- byte[] ba;
- // short[] sa; // not handled corrected by javah v6
- int[] ia;
- long[] la;
- float[] fa;
- double[] da;
- Object[] oa;
- String[] ta;
- List[] ga;
-
- // multidimensional arrays
- byte[][] baa;
- short[][] saa;
- int[][] iaa;
- long[][] laa;
- float[][] faa;
- double[][] daa;
- Object[][] oaa;
- String[][] taa;
- List[] gaa;
-
- // simple Java methods
- byte bm() { return 0; }
- short sm() { return 0; }
- int im() { return 0; }
- long lm() { return 0; }
- float fm() { return 0; }
- double dm() { return 0; }
- Object om() { return null; }
- String tm() { return ""; }
- List gm() { return null; }
- void vm() { }
-
- // simple native methods
- native byte bmn();
- native short smn();
- native int imn();
- native long lmn();
- native float fmn();
- native double dmn();
- native Object omn();
- native String tmn();
- native List gmn();
- native void vmn();
-
- // overloaded Java methods
- byte bm1() { return 0; }
- short sm1() { return 0; }
- int im1() { return 0; }
- long lm1() { return 0; }
- float fm1() { return 0; }
- double dm1() { return 0; }
- Object om1() { return null; }
- String tm1() { return ""; }
- List gm1() { return null; }
- void vm1() { }
-
- byte bm2(int i) { return 0; }
- short sm2(int i) { return 0; }
- int im2(int i) { return 0; }
- long lm2(int i) { return 0; }
- float fm2(int i) { return 0; }
- double dm2(int i) { return 0; }
- Object om2(int i) { return null; }
- String tm2(int i) { return ""; }
- List gm2(int i) { return null; }
- void vm2(int i) { }
-
- // overloaded native methods
- native byte bmn1();
- native short smn1();
- native int imn1();
- native long lmn1();
- native float fmn1();
- native double dmn1();
- native Object omn1();
- native String tmn1();
- native List gmn1();
- native void vmn1();
-
- native byte bmn2(int i);
- native short smn2(int i);
- native int imn2(int i);
- native long lmn2(int i);
- native float fmn2(int i);
- native double dmn2(int i);
- native Object omn2(int i);
- native String tmn2(int i);
- native List gmn2(int i);
- native void vmn2(int i);
-
- // arg types for Java methods
- void mb(byte b) { }
- void ms(short s) { }
- void mi(int i) { }
- void ml(long l) { }
- void mf(float f) { }
- void md(double d) { }
- void mo(Object o) { }
- void mt(String t) { }
- void mg(List g) { }
-
- // arg types for native methods
- native void mbn(byte b);
- native void msn(short s);
- native void min(int i);
- native void mln(long l);
- native void mfn(float f);
- native void mdn(double d);
- native void mon(Object o);
- native void mtn(String t);
- native void mgn(List g);
- }
-
-}
--- old/test/langtools/tools/javah/6572945/TestClass2.java 2017-11-09 15:06:47.102220343 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- */
-
-public class TestClass2 {
- byte b;
- short s;
- int i;
- long l;
- float f;
- double d;
- Object o;
- String t;
-}
--- old/test/langtools/tools/javah/6572945/TestClass3.java 2017-11-09 15:06:47.590241644 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- */
-
-public class TestClass3 {
- public int tc3;
-
- public class Inner1 {
- public int tc3i1;
-
- public class Inner1A {
- public int tc3i1i1a;
- }
-
- public class Inner1B {
- public int tc3i1i1b;
- }
- }
-
- public class Inner2 {
- public int tc321;
-
- public class Inner2A {
- public int tc3i2i2a;
- }
-
- public class Inner2B {
- public int tc3i2i2b;
- }
- }
-}
-
--- old/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h 2017-11-09 15:06:48.186267660 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,481 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass1 */
-
-#ifndef _Included_TestClass1
-#define _Included_TestClass1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_bc
-#define TestClass1_bc 0L
-#undef TestClass1_sc
-#define TestClass1_sc 0L
-#undef TestClass1_ic
-#define TestClass1_ic 0L
-#undef TestClass1_lc
-#define TestClass1_lc 0LL
-#undef TestClass1_fc
-#define TestClass1_fc 0.0f
-#undef TestClass1_dc
-#define TestClass1_dc 0.0
-/*
- * Class: TestClass1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bamn
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_TestClass1_bamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: samn
- * Signature: ()[S
- */
-JNIEXPORT jshortArray JNICALL Java_TestClass1_samn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iamn
- * Signature: ()[I
- */
-JNIEXPORT jintArray JNICALL Java_TestClass1_iamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lamn
- * Signature: ()[J
- */
-JNIEXPORT jlongArray JNICALL Java_TestClass1_lamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: famn
- * Signature: ()[F
- */
-JNIEXPORT jfloatArray JNICALL Java_TestClass1_famn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: damn
- * Signature: ()[D
- */
-JNIEXPORT jdoubleArray JNICALL Java_TestClass1_damn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oamn
- * Signature: ()[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tamn
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_tamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: baamn
- * Signature: ()[[B
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_baamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: saamn
- * Signature: ()[[S
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_saamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iaamn
- * Signature: ()[[I
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_iaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: laamn
- * Signature: ()[[J
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_laamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: faamn
- * Signature: ()[[F
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_faamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: daamn
- * Signature: ()[[D
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_daamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oaamn
- * Signature: ()[[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: taamn
- * Signature: ()[[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_taamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gaamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h 2017-11-09 15:06:48.774293326 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,337 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass1_Inner1 */
-
-#ifndef _Included_TestClass1_Inner1
-#define _Included_TestClass1_Inner1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner1_bc
-#define TestClass1_Inner1_bc 0L
-#undef TestClass1_Inner1_sc
-#define TestClass1_Inner1_sc 0L
-#undef TestClass1_Inner1_ic
-#define TestClass1_Inner1_ic 0L
-#undef TestClass1_Inner1_lc
-#define TestClass1_Inner1_lc 0LL
-#undef TestClass1_Inner1_fc
-#define TestClass1_Inner1_fc 0.0f
-#undef TestClass1_Inner1_dc
-#define TestClass1_Inner1_dc 0.0
-/*
- * Class: TestClass1_Inner1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h 2017-11-09 15:06:49.358318818 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,337 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass1_Inner2 */
-
-#ifndef _Included_TestClass1_Inner2
-#define _Included_TestClass1_Inner2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner2_bc
-#define TestClass1_Inner2_bc 0L
-#undef TestClass1_Inner2_sc
-#define TestClass1_Inner2_sc 0L
-#undef TestClass1_Inner2_ic
-#define TestClass1_Inner2_ic 0L
-#undef TestClass1_Inner2_lc
-#define TestClass1_Inner2_lc 0LL
-#undef TestClass1_Inner2_fc
-#define TestClass1_Inner2_fc 0.0f
-#undef TestClass1_Inner2_dc
-#define TestClass1_Inner2_dc 0.0
-/*
- * Class: TestClass1_Inner2
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner2
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner2
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h 2017-11-09 15:06:49.834339595 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass2 */
-
-#ifndef _Included_TestClass2
-#define _Included_TestClass2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.file.1 2017-11-09 15:06:50.326361072 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,1151 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass1 */
-
-#ifndef _Included_TestClass1
-#define _Included_TestClass1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_bc
-#define TestClass1_bc 0L
-#undef TestClass1_sc
-#define TestClass1_sc 0L
-#undef TestClass1_ic
-#define TestClass1_ic 0L
-#undef TestClass1_lc
-#define TestClass1_lc 0LL
-#undef TestClass1_fc
-#define TestClass1_fc 0.0f
-#undef TestClass1_dc
-#define TestClass1_dc 0.0
-/*
- * Class: TestClass1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bamn
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_TestClass1_bamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: samn
- * Signature: ()[S
- */
-JNIEXPORT jshortArray JNICALL Java_TestClass1_samn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iamn
- * Signature: ()[I
- */
-JNIEXPORT jintArray JNICALL Java_TestClass1_iamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lamn
- * Signature: ()[J
- */
-JNIEXPORT jlongArray JNICALL Java_TestClass1_lamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: famn
- * Signature: ()[F
- */
-JNIEXPORT jfloatArray JNICALL Java_TestClass1_famn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: damn
- * Signature: ()[D
- */
-JNIEXPORT jdoubleArray JNICALL Java_TestClass1_damn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oamn
- * Signature: ()[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tamn
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_tamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: baamn
- * Signature: ()[[B
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_baamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: saamn
- * Signature: ()[[S
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_saamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iaamn
- * Signature: ()[[I
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_iaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: laamn
- * Signature: ()[[J
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_laamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: faamn
- * Signature: ()[[F
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_faamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: daamn
- * Signature: ()[[D
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_daamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oaamn
- * Signature: ()[[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: taamn
- * Signature: ()[[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_taamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gaamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass1_Inner2 */
-
-#ifndef _Included_TestClass1_Inner2
-#define _Included_TestClass1_Inner2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner2_bc
-#define TestClass1_Inner2_bc 0L
-#undef TestClass1_Inner2_sc
-#define TestClass1_Inner2_sc 0L
-#undef TestClass1_Inner2_ic
-#define TestClass1_Inner2_ic 0L
-#undef TestClass1_Inner2_lc
-#define TestClass1_Inner2_lc 0LL
-#undef TestClass1_Inner2_fc
-#define TestClass1_Inner2_fc 0.0f
-#undef TestClass1_Inner2_dc
-#define TestClass1_Inner2_dc 0.0
-/*
- * Class: TestClass1_Inner2
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner2
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner2
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass1_Inner1 */
-
-#ifndef _Included_TestClass1_Inner1
-#define _Included_TestClass1_Inner1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner1_bc
-#define TestClass1_Inner1_bc 0L
-#undef TestClass1_Inner1_sc
-#define TestClass1_Inner1_sc 0L
-#undef TestClass1_Inner1_ic
-#define TestClass1_Inner1_ic 0L
-#undef TestClass1_Inner1_lc
-#define TestClass1_Inner1_lc 0LL
-#undef TestClass1_Inner1_fc
-#define TestClass1_Inner1_fc 0.0f
-#undef TestClass1_Inner1_dc
-#define TestClass1_Inner1_dc 0.0
-/*
- * Class: TestClass1_Inner1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.file.2 2017-11-09 15:06:50.818382547 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,1162 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass1 */
-
-#ifndef _Included_TestClass1
-#define _Included_TestClass1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_bc
-#define TestClass1_bc 0L
-#undef TestClass1_sc
-#define TestClass1_sc 0L
-#undef TestClass1_ic
-#define TestClass1_ic 0L
-#undef TestClass1_lc
-#define TestClass1_lc 0LL
-#undef TestClass1_fc
-#define TestClass1_fc 0.0f
-#undef TestClass1_dc
-#define TestClass1_dc 0.0
-/*
- * Class: TestClass1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bamn
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_TestClass1_bamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: samn
- * Signature: ()[S
- */
-JNIEXPORT jshortArray JNICALL Java_TestClass1_samn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iamn
- * Signature: ()[I
- */
-JNIEXPORT jintArray JNICALL Java_TestClass1_iamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lamn
- * Signature: ()[J
- */
-JNIEXPORT jlongArray JNICALL Java_TestClass1_lamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: famn
- * Signature: ()[F
- */
-JNIEXPORT jfloatArray JNICALL Java_TestClass1_famn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: damn
- * Signature: ()[D
- */
-JNIEXPORT jdoubleArray JNICALL Java_TestClass1_damn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oamn
- * Signature: ()[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tamn
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_tamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: baamn
- * Signature: ()[[B
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_baamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: saamn
- * Signature: ()[[S
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_saamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: iaamn
- * Signature: ()[[I
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_iaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: laamn
- * Signature: ()[[J
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_laamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: faamn
- * Signature: ()[[F
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_faamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: daamn
- * Signature: ()[[D
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_daamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: oaamn
- * Signature: ()[[Ljava/lang/Object;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_oaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: taamn
- * Signature: ()[[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_taamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gaamn
- * Signature: ()[Ljava/util/List;
- */
-JNIEXPORT jobjectArray JNICALL Java_TestClass1_gaamn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass1_Inner2 */
-
-#ifndef _Included_TestClass1_Inner2
-#define _Included_TestClass1_Inner2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner2_bc
-#define TestClass1_Inner2_bc 0L
-#undef TestClass1_Inner2_sc
-#define TestClass1_Inner2_sc 0L
-#undef TestClass1_Inner2_ic
-#define TestClass1_Inner2_ic 0L
-#undef TestClass1_Inner2_lc
-#define TestClass1_Inner2_lc 0LL
-#undef TestClass1_Inner2_fc
-#define TestClass1_Inner2_fc 0.0f
-#undef TestClass1_Inner2_dc
-#define TestClass1_Inner2_dc 0.0
-/*
- * Class: TestClass1_Inner2
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner2_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner2_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner2_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner2_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner2_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner2_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner2_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner2_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner2
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner2
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner2
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner2_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass1_Inner1 */
-
-#ifndef _Included_TestClass1_Inner1
-#define _Included_TestClass1_Inner1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef TestClass1_Inner1_bc
-#define TestClass1_Inner1_bc 0L
-#undef TestClass1_Inner1_sc
-#define TestClass1_Inner1_sc 0L
-#undef TestClass1_Inner1_ic
-#define TestClass1_Inner1_ic 0L
-#undef TestClass1_Inner1_lc
-#define TestClass1_Inner1_lc 0LL
-#undef TestClass1_Inner1_fc
-#define TestClass1_Inner1_fc 0.0f
-#undef TestClass1_Inner1_dc
-#define TestClass1_Inner1_dc 0.0
-/*
- * Class: TestClass1_Inner1
- * Method: bmn
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn1
- * Signature: ()B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn1
- * Signature: ()S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn1
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn1
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn1
- * Signature: ()F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn1
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn1
- * Signature: ()Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn1
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn1
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn1
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn1
- (JNIEnv *, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: bmn2
- * Signature: (I)B
- */
-JNIEXPORT jbyte JNICALL Java_TestClass1_00024Inner1_bmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: smn2
- * Signature: (I)S
- */
-JNIEXPORT jshort JNICALL Java_TestClass1_00024Inner1_smn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: imn2
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_TestClass1_00024Inner1_imn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: lmn2
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_TestClass1_00024Inner1_lmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: fmn2
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_TestClass1_00024Inner1_fmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: dmn2
- * Signature: (I)D
- */
-JNIEXPORT jdouble JNICALL Java_TestClass1_00024Inner1_dmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: omn2
- * Signature: (I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_omn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: tmn2
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_TestClass1_00024Inner1_tmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: gmn2
- * Signature: (I)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_TestClass1_00024Inner1_gmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: vmn2
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_vmn2
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mbn
- * Signature: (B)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mbn
- (JNIEnv *, jobject, jbyte);
-
-/*
- * Class: TestClass1_Inner1
- * Method: msn
- * Signature: (S)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_msn
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: TestClass1_Inner1
- * Method: min
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_min
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mln
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mln
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mfn
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mfn
- (JNIEnv *, jobject, jfloat);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mdn
- * Signature: (D)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mdn
- (JNIEnv *, jobject, jdouble);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mon
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mon
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mtn
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mtn
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: TestClass1_Inner1
- * Method: mgn
- * Signature: (Ljava/util/List;)V
- */
-JNIEXPORT void JNICALL Java_TestClass1_00024Inner1_mgn
- (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass2 */
-
-#ifndef _Included_TestClass2
-#define _Included_TestClass2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/6572945/gold/jni.file.3 2017-11-09 15:06:51.302403674 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,79 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class TestClass3 */
-
-#ifndef _Included_TestClass3
-#define _Included_TestClass3
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner2 */
-
-#ifndef _Included_TestClass3_Inner2
-#define _Included_TestClass3_Inner2
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner2_Inner2B */
-
-#ifndef _Included_TestClass3_Inner2_Inner2B
-#define _Included_TestClass3_Inner2_Inner2B
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner2_Inner2A */
-
-#ifndef _Included_TestClass3_Inner2_Inner2A
-#define _Included_TestClass3_Inner2_Inner2A
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner1 */
-
-#ifndef _Included_TestClass3_Inner1
-#define _Included_TestClass3_Inner1
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner1_Inner1B */
-
-#ifndef _Included_TestClass3_Inner1_Inner1B
-#define _Included_TestClass3_Inner1_Inner1B
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class TestClass3_Inner1_Inner1A */
-
-#ifndef _Included_TestClass3_Inner1_Inner1A
-#define _Included_TestClass3_Inner1_Inner1A
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
--- old/test/langtools/tools/javah/ModuleClass.java 2017-11-09 15:06:51.866428293 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, 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 8049811
- * @summary javah should accept module/class names
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.main
- * jdk.compiler/com.sun.tools.javah
- * @build toolbox.ToolBox toolbox.JavahTask
- * @run main ModuleClass
- */
-
-import java.util.List;
-
-import toolbox.JavahTask;
-import toolbox.ToolBox;
-
-public class ModuleClass {
- static public void main(String[] args) throws Exception {
- ToolBox tb = new ToolBox();
- check(tb, "java.lang.Object");
- check(tb, "java.base/java.io.File");
- }
-
- static void check(ToolBox tb, String name) throws Exception {
- new JavahTask(tb)
- .classes(name)
- .run();
-
- int sep = name.indexOf("/");
- String className = (sep == -1) ? name : name.substring(sep + 1);
- String file = className.replace(".", "_") + ".h";
- List outObject = tb.readAllLines(file);
-
- String text = "#ifndef _Included_" + className.replace(".", "_");
- if (!outObject.contains(text)) {
- throw new Exception("expected line not found");
- }
- }
-}
-
--- old/test/langtools/tools/javah/ReadOldClass.sh 2017-11-09 15:06:52.462454308 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2005, 2009, 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 4164450
-# @summary Ensure that javah/javadoc doesn't try to read (new) source files
-# @author Peter von der Ah\u00e9
-# @run shell ReadOldClass.sh
-#
-
-TS=${TESTSRC-.}
-TC=${TESTCLASSES-.}
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin | CYGWIN* )
- PS=":"
- FS="/"
- ;;
- Windows* )
- PS=";"
- FS="\\"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-cat > "${TC}/ReadOldClass.java" < cmd = new ArrayList();
- File java_home = new File(System.getProperty("java.home"));
- cmd.add(new File(new File(java_home, "bin"), "javah").getPath());
-
- cmd.add("JavahTest");
-
- ProcessBuilder pb = new ProcessBuilder(cmd);
- pb.redirectErrorStream(true);
- pb.environment().remove("CLASSPATH");
- Process p = pb.start();
- p.getOutputStream().close();
-
- String line;
- DataInputStream in = new DataInputStream(p.getInputStream());
- try {
- while ((line = in.readLine()) != null)
- System.err.println(line);
- } finally {
- in.close();
- }
-
- return p.waitFor();
- }
-}
--- old/test/langtools/tools/javah/T6893943.java 2017-11-09 15:06:54.018522228 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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 6893943 6937318
- * @summary exit code from javah with no args is 0
- * @modules jdk.compiler/com.sun.tools.javah
- */
-
-import java.io.*;
-import java.util.*;
-
-public class T6893943 {
- static final String[] NO_ARGS = { "-XDsuppress-tool-removal-message" };
- static final String[] SUPPRESS_WARNING_PLUS_HELP = { "-XDsuppress-tool-removal-message", "-help" };
- static final String NEWLINE = System.getProperty("line.separator");
-
- public static void main(String... args) throws Exception {
- new T6893943().run();
- }
-
- void run() throws Exception {
- testSimpleAPI(NO_ARGS, 1);
- testSimpleAPI(SUPPRESS_WARNING_PLUS_HELP, 0);
- testCommand(NO_ARGS, 1);
- testCommand(SUPPRESS_WARNING_PLUS_HELP, 0);
- }
-
- void testSimpleAPI(String[] args, int expect_rc) throws Exception {
- System.err.println("Test simple api: " + Arrays.asList(args));
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- int rc = com.sun.tools.javah.Main.run(args, pw);
- pw.close();
- expect("testSimpleAPI", sw.toString(), rc, expect_rc);
- }
-
- void testCommand(String[] args, int expect_rc) throws Exception {
- System.err.println("Test command: " + Arrays.asList(args));
- File javaHome = new File(System.getProperty("java.home"));
- List command = new ArrayList();
- command.add(new File(new File(javaHome, "bin"), "javah").getPath());
- command.addAll(Arrays.asList(args));
- //System.err.println("command: " + command);
-
- ProcessBuilder pb = new ProcessBuilder(command);
- pb.redirectErrorStream(true);
- Process p = pb.start();
- p.getOutputStream().close();
- StringWriter sw = new StringWriter();
- String line;
- BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
- while ((line = in.readLine()) != null)
- sw.write(line + NEWLINE);
- int rc = p.waitFor();
- expect("testCommand", sw.toString(), rc, expect_rc);
- }
-
- void expect(String name, String out, int actual_rc, int expect_rc) throws Exception {
- if (out.isEmpty())
- throw new Exception("No output from javah");
-
- if (actual_rc != expect_rc)
- throw new Exception(name + ": unexpected exit: " + actual_rc + ", expected: " + expect_rc);
- }
-}
--- old/test/langtools/tools/javah/T6994608.java 2017-11-09 15:06:54.494543006 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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 6994608
- * @summary javah no longer accepts parameter files as input
- * @modules jdk.compiler/com.sun.tools.javah
- */
-
-import java.io.*;
-import java.util.*;
-
-public class T6994608 {
- public static void main(String... args) throws Exception {
- new T6994608().run();
- }
-
- void run() throws Exception {
- Locale prev = Locale.getDefault();
- Locale.setDefault(Locale.ENGLISH);
- try {
- File f = writeFile(new File("classList"), "java.lang.Object");
- test(Arrays.asList("@" + f.getPath()), 0, null);
- test(Arrays.asList("@badfile"), 1, "Can't find file badfile");
- if (errors > 0)
- throw new Exception(errors + " errors occurred");
- } finally {
- Locale.setDefault(prev);
- }
- }
-
- void test(List args, int expectRC, String expectOut) {
- System.err.println("Test: " + args
- + " rc:" + expectRC
- + ((expectOut != null) ? " out:" + expectOut : ""));
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- int rc = com.sun.tools.javah.Main.run(args.toArray(new String[args.size()]), pw);
- pw.close();
- String out = sw.toString();
- if (!out.isEmpty())
- System.err.println(out);
-
- if (rc != expectRC)
- error("Unexpected exit code: " + rc + "; expected: " + expectRC);
- if (expectOut != null && !out.contains(expectOut))
- error("Expected string not found: " + expectOut);
-
- System.err.println();
- }
-
- File writeFile(File f, String s) throws IOException {
- if (f.getParentFile() != null)
- f.getParentFile().mkdirs();
- try (FileWriter out = new FileWriter(f)) {
- out.write(s);
- }
- return f;
- }
-
- void error(String msg) {
- System.err.println(msg);
- errors++;
- }
-
- int errors;
-}
-
--- old/test/langtools/tools/javah/T7126832/T7126832.java 2017-11-09 15:06:54.990564656 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, 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 7126832
- * @modules jdk.compiler/com.sun.tools.javah
- * @compile java.java
- * @summary com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager cannot be cast
- * @run main T7126832
- */
-
-import java.io.*;
-import java.util.*;
-
-public class T7126832 {
- public static void main(String... args) throws Exception {
- new T7126832().run();
- }
-
- void run() throws Exception {
- Locale prev = Locale.getDefault();
- Locale.setDefault(Locale.ENGLISH);
- try {
- // Verify that a .java file is correctly diagnosed
- File ff = writeFile(new File("JavahTest.java"), "class JavahTest {}");
- test(Arrays.asList(ff.getPath()), 1, "Could not find class file for 'JavahTest.java'.");
-
- // Verify that a class named 'xx.java' is accepted.
- // Note that ./xx/java.class exists, so this should work ok
- test(Arrays.asList("xx.java"), 0, null);
-
- if (errors > 0) {
- throw new Exception(errors + " errors occurred");
- }
- } finally {
- Locale.setDefault(prev);
- }
- }
-
- void test(List args, int expectRC, String expectOut) {
- System.err.println("Test: " + args
- + " rc:" + expectRC
- + ((expectOut != null) ? " out:" + expectOut : ""));
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- int rc = 0;
- String out = null;
- try {
- rc = com.sun.tools.javah.Main.run(args.toArray(new String[args.size()]), pw);
- out = sw.toString();
- } catch(Exception ee) {
- rc = 1;
- out = ee.toString();;
- }
- pw.close();
- if (!out.isEmpty()) {
- System.err.println(out);
- }
- if (rc != expectRC) {
- error("Unexpected exit code: " + rc + "; expected: " + expectRC);
- }
- if (expectOut != null && !out.contains(expectOut)) {
- error("Expected string not found: " + expectOut);
- }
-
- System.err.println();
- }
-
- File writeFile(File ff, String ss) throws IOException {
- if (ff.getParentFile() != null)
- ff.getParentFile().mkdirs();
-
- try (FileWriter out = new FileWriter(ff)) {
- out.write(ss);
- }
- return ff;
- }
-
- void error(String msg) {
- System.err.println(msg);
- errors++;
- }
-
- int errors;
-}
-
--- old/test/langtools/tools/javah/T7126832/java.java 2017-11-09 15:06:55.514587529 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2012, 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.
- */
-
-package xx;
-class java {
- int fred;
-}
--- old/test/langtools/tools/javah/T7185778.java 2017-11-09 15:06:56.114613719 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, 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 7185778
- * @summary javah error "Not a valid class name" on class names with dollar signs
- * The first two tests are on an inner class name whose name does not contain $.
- * The second two tests are on an inner class name whose name does contain $.
- * The last test is on an outer class whose name contains $.
- * @modules jdk.compiler/com.sun.tools.javah
- * @run main T7185778 T7185778$inner
- * @run main T7185778 T7185778.inner
- * @run main T7185778 T7185778$inner$
- * @run main T7185778 T7185778.inner$
- * @run main T7185778 xx$yy
- */
-
-public class T7185778 {
- class inner {
- native byte[] xxxxx(String name);
- }
- class inner$ {
- native byte[] xxxxx(String name);
- }
-
- static public void main(String[] args) {
- int rc = com.sun.tools.javah.Main.run(args, null);
- if ( rc != 0) {
- throw new Error("javah returned non zero: " + rc);
- }
- }
-}
-
-class xx$yy {
- native byte[] xxxxx(String name);
-}
--- old/test/langtools/tools/javah/TestHelpOpts.java 2017-11-09 15:06:56.714639909 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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 6893932 6990390
- * @summary javah help screen lists -h and -? but does not accept them
- * @modules jdk.compiler/com.sun.tools.javah
- */
-
-import java.io.*;
-import java.util.*;
-
-public class TestHelpOpts {
- public static void main(String... args) throws Exception {
- new TestHelpOpts().run();
- }
-
- void run() throws Exception {
- Locale prev = Locale.getDefault();
- try {
- Locale.setDefault(Locale.ENGLISH);
-
- String[] opts = { "-h", "-help", "-?", "--help" };
- for (String opt: opts)
- test(opt);
- } finally {
- Locale.setDefault(prev);
- }
-
- if (errors > 0)
- throw new Exception(errors + " errors occurred");
- }
-
- void test(String opt) {
- System.err.println("test " + opt);
- String[] args = { opt };
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- int rc = com.sun.tools.javah.Main.run(args, pw);
- pw.close();
- String out = sw.toString();
- if (!out.isEmpty())
- System.err.println(out);
- if (rc != 0)
- error("Unexpected exit: rc=" + rc);
-
- String flat = out.replaceAll("\\s+", " "); // canonicalize whitespace
- if (!flat.contains("Usage: javah [options] where [options] include:"))
- error("expected text not found");
- if (flat.contains("main.opt"))
- error("key not found in resource bundle: " + flat.replaceAll(".*(main.opt.[^ ]*).*", "$1"));
- }
-
- void error(String msg) {
- System.err.println(msg);
- errors++;
- }
-
- int errors;
-}
--- old/test/langtools/tools/javah/VersionTest.java 2017-11-09 15:06:57.310665924 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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 6890226
- * @summary javah -version is broken
- * @modules jdk.compiler/com.sun.tools.javah
- */
-
-import java.io.*;
-import java.util.Locale;
-
-public class VersionTest {
- public static void main(String... args) {
- Locale prev = Locale.getDefault();
- try {
- Locale.setDefault(Locale.ENGLISH);
- System.err.println(Locale.getDefault());
- test("-version -XDsuppress-tool-removal-message", "\\S+ version \"\\S+\"");
- test("-fullversion -XDsuppress-tool-removal-message", "\\S+ full version \"\\S+\"");
- } finally {
- Locale.setDefault(prev);
- }
- }
-
- static void test(String option, String regex) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- String[] args = option.split(" ");
- int rc = com.sun.tools.javah.Main.run(args, pw);
- pw.close();
- if (rc != 0)
- throw new Error("javah failed: rc=" + rc);
- String out = sw.toString().trim();
- System.err.println(out);
- if (!out.matches(regex))
- throw new Error("output does not match pattern: " + regex);
- }
-}
--- old/test/langtools/tools/javah/constMacroTest/ConstMacroTest.java 2017-11-09 15:06:57.878690718 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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 4786406 4781221 4780341 6214324
- * @summary Validates rewritten javah handling of class defined constants and
- * ensures that the appropriate macro definitions are placed in the generated
- * header file.
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.main
- * jdk.compiler/com.sun.tools.javah
- * @build toolbox.ToolBox toolbox.JavahTask
- * @run main ConstMacroTest
- */
-
-import java.io.*;
-import java.util.List;
-
-import toolbox.JavahTask;
-import toolbox.ToolBox;
-
-// Original test: test/tools/javah/ConstMacroTest.sh
-public class ConstMacroTest {
-
- private static final String subClassConstsGoldenFileTemplate =
- "/* DO NOT EDIT THIS FILE - it is machine generated */\n" +
- "#include \n" +
- "/* Header for class SubClassConsts */\n" +
- "\n" +
- "#ifndef _Included_SubClassConsts\n" +
- "#define _Included_SubClassConsts\n" +
- "#ifdef __cplusplus\n" +
- "extern \"C\" {\n" +
- "#endif\n" +
- "#undef SubClassConsts_serialVersionUID\n" +
- "#define SubClassConsts_serialVersionUID 6733861379283244755%s\n" +
- "#undef SubClassConsts_SUPER_INT_CONSTANT\n" +
- "#define SubClassConsts_SUPER_INT_CONSTANT 3L\n" +
- "#undef SubClassConsts_SUPER_FLOAT_CONSTANT\n" +
- "#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f\n" +
- "#undef SubClassConsts_SUPER_DOUBLE_CONSTANT\n" +
- "#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2\n" +
- "#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT\n" +
- "#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L\n" +
- "#undef SubClassConsts_SUB_INT_CONSTANT\n" +
- "#define SubClassConsts_SUB_INT_CONSTANT 2L\n" +
- "#undef SubClassConsts_SUB_DOUBLE_CONSTANT\n" +
- "#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25\n" +
- "#undef SubClassConsts_SUB_FLOAT_CONSTANT\n" +
- "#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f\n" +
- "#undef SubClassConsts_SUB_BOOLEAN_CONSTANT\n" +
- "#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L\n" +
- "#ifdef __cplusplus\n" +
- "}\n" +
- "#endif\n" +
- "#endif";
-
- public static void main(String[] args) throws Exception {
- ToolBox tb = new ToolBox();
-
- new JavahTask(tb)
- .classpath(ToolBox.testClasses)
- .classes("SubClassConsts")
- .run();
-
- String longSuffix = tb.isWindows() ? "i64" : "LL";
- List subClassConstsGoldenFile = tb.split(
- String.format(subClassConstsGoldenFileTemplate, longSuffix), "\n");
-
- List subClassConstsFile = tb.readAllLines("SubClassConsts.h");
-
- tb.checkEqual(subClassConstsFile, subClassConstsGoldenFile);
- }
-
-}
-
-class SuperClassConsts implements Serializable {
- // Define class constant values, base class is serializable
- private static final long serialVersionUID = 6733861379283244755L;
- public static final int SUPER_INT_CONSTANT = 3;
- public final static float SUPER_FLOAT_CONSTANT = 99.3f;
- public final static double SUPER_DOUBLE_CONSTANT = 33.2;
- public final static boolean SUPER_BOOLEAN_CONSTANT = false;
- // A token instance field
- int instanceField;
-
- public native int numValues();
-}
-
-class SubClassConsts extends SuperClassConsts {
- private final static int SUB_INT_CONSTANT = 2;
- private final static double SUB_DOUBLE_CONSTANT = 2.25;
- private final static float SUB_FLOAT_CONSTANT = 7.90f;
- private final static boolean SUB_BOOLEAN_CONSTANT = true;
-}
--- old/test/langtools/tools/lib/toolbox/JavahTask.java 2017-11-09 15:06:58.426714638 -0800
+++ /dev/null 2017-01-21 22:54:52.877512947 -0800
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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.
- */
-
-package toolbox;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A task to configure and run the native header tool, javah.
- */
-public class JavahTask extends AbstractTask {
- private String classpath;
- private List options;
- private List classes;
-
- /**
- * Create a task to execute {@code javah} using {@code CMDLINE} mode.
- * @param toolBox the {@code ToolBox} to use
- */
- public JavahTask(ToolBox toolBox) {
- super(toolBox, Task.Mode.CMDLINE);
- }
-
- /**
- * Sets the classpath.
- * @param classpath the classpath
- * @return this task object
- */
- public JavahTask classpath(String classpath) {
- this.classpath = classpath;
- return this;
- }
-
- /**
- * Sets the options.
- * @param options the options
- * @return this task object
- */
- public JavahTask options(String... options) {
- this.options = Arrays.asList(options);
- return this;
- }
-
- /**
- * Sets the classes to be analyzed.
- * @param classes the classes
- * @return this task object
- */
- public JavahTask classes(String... classes) {
- this.classes = Arrays.asList(classes);
- return this;
- }
-
- /**
- * {@inheritDoc}
- * @return the name "javah"
- */
- @Override
- public String name() {
- return "javah";
- }
-
- /**
- * Calls the javah tool with the arguments as currently configured.
- * @return a Result object indicating the outcome of the task
- * and the content of any output written to stdout, stderr, or the
- * main stream provided to the task.
- * @throws TaskError if the outcome of the task is not as expected.
- */
- @Override
- public Task.Result run() {
- List args = new ArrayList<>();
- if (options != null)
- args.addAll(options);
- if (classpath != null) {
- args.add("-classpath");
- args.add(classpath);
- }
- if (classes != null)
- args.addAll(classes);
-
- AbstractTask.WriterOutput direct = new AbstractTask.WriterOutput();
- // These are to catch output to System.out and System.err,
- // in case these are used instead of the primary streams
- AbstractTask.StreamOutput sysOut = new AbstractTask.StreamOutput(System.out, System::setOut);
- AbstractTask.StreamOutput sysErr = new AbstractTask.StreamOutput(System.err, System::setErr);
- int rc;
- Map outputMap = new HashMap<>();
- try {
- rc = com.sun.tools.javah.Main.run(args.toArray(new String[args.size()]), direct.pw);
- } finally {
- outputMap.put(Task.OutputKind.STDOUT, sysOut.close());
- outputMap.put(Task.OutputKind.STDERR, sysErr.close());
- outputMap.put(Task.OutputKind.DIRECT, direct.close());
- }
- return checkExit(new Task.Result(toolBox, this, rc, outputMap));
- }
-}