mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-15 08:34:30 +02:00
8135068: Extract method matchers from CompilerOracle
Ecapsulate code to enable reuse Reviewed-by: roland, kvn
This commit is contained in:
Nils Eliasson
parent
ff77d8762c
commit
5ca8983920
17 changed files with 1072 additions and 523 deletions
|
|
@ -78,7 +78,7 @@ cp ${TESTSRC}/Test7005594.sh .
|
|||
|
||||
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
|
||||
|
||||
${TESTJAVA}/bin/java ${TESTOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
|
||||
${TESTJAVA}/bin/java ${TESTOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test -XX:CompileCommand=quiet Test7005594 > test.out 2>&1
|
||||
|
||||
result=$?
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ public class CheckCompileCommandOption {
|
|||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption1 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption2 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption3 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption4 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption5 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption6 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption7 = true",
|
||||
|
|
@ -74,7 +73,6 @@ public class CheckCompileCommandOption {
|
|||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption9 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption10 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption11 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption12 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption13 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption14 = true",
|
||||
"CompileCommand: option com/oracle/Test.test(I) bool MyBoolOption15 = true",
|
||||
|
|
@ -96,7 +94,6 @@ public class CheckCompileCommandOption {
|
|||
"-XX:CompileCommand=option,com/oracle/Test.test,MyBoolOption1",
|
||||
"-XX:CompileCommand=option,com/oracle/Test,test,MyBoolOption2",
|
||||
"-XX:CompileCommand=option,com.oracle.Test::test,MyBoolOption3",
|
||||
"-XX:CompileCommand=option,com/oracle/Test::test,MyBoolOption4",
|
||||
"-XX:CompileCommand=option,com/oracle/Test.test,MyBoolOption5,MyBoolOption6",
|
||||
"-XX:CompileCommand=option,com/oracle/Test,test,MyBoolOption7,MyBoolOption8",
|
||||
"-version"
|
||||
|
|
@ -108,7 +105,6 @@ public class CheckCompileCommandOption {
|
|||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption1 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption2 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption3 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption4 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption5 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption6 = true",
|
||||
"CompileCommand: option com/oracle/Test.test bool MyBoolOption7 = true",
|
||||
|
|
@ -198,7 +194,7 @@ public class CheckCompileCommandOption {
|
|||
out.shouldContain(expected_output);
|
||||
}
|
||||
|
||||
out.shouldNotContain("CompileCommand: An error occured during parsing");
|
||||
out.shouldNotContain("CompileCommand: An error occurred during parsing");
|
||||
out.shouldHaveExitValue(0);
|
||||
}
|
||||
|
||||
|
|
@ -209,7 +205,7 @@ public class CheckCompileCommandOption {
|
|||
pb = ProcessTools.createJavaProcessBuilder(arguments);
|
||||
out = new OutputAnalyzer(pb.start());
|
||||
|
||||
out.shouldContain("CompileCommand: An error occured during parsing");
|
||||
out.shouldContain("CompileCommand: An error occurred during parsing");
|
||||
out.shouldHaveExitValue(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
239
hotspot/test/compiler/oracle/MethodMatcherTest.java
Normal file
239
hotspot/test/compiler/oracle/MethodMatcherTest.java
Normal file
|
|
@ -0,0 +1,239 @@
|
|||
/*
|
||||
* Copyright (c) 2015, 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 MethodMatcherTest
|
||||
* @library /testlibrary /../../test/lib
|
||||
* @run main ClassFileInstaller sun.hotspot.WhiteBox
|
||||
* sun.hotspot.WhiteBox$WhiteBoxPermission
|
||||
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MethodMatcherTest
|
||||
* @summary Testing of compiler/MethodMatcher
|
||||
* @bug 8135068
|
||||
*/
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import sun.hotspot.WhiteBox;
|
||||
|
||||
public class MethodMatcherTest {
|
||||
|
||||
/** Instance of WhiteBox */
|
||||
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
|
||||
|
||||
Method helper;
|
||||
Method getDate;
|
||||
Method inner;
|
||||
Method toString;
|
||||
|
||||
static final int MATCH = 1;
|
||||
static final int NO_MATCH = 0;
|
||||
static final int PARSING_FAILURE = -1;
|
||||
|
||||
public MethodMatcherTest() {
|
||||
}
|
||||
|
||||
public void test() throws Exception {
|
||||
// instantiate before calling getMethod on innerHelper
|
||||
TestCases testCases = new TestCases();
|
||||
|
||||
helper = getMethod(MethodMatcherTest.class, "helper");
|
||||
getDate = getMethod(java.util.Date.class, "getDate");
|
||||
inner = getMethod(TestCases.class, "innerHelper");
|
||||
toString = getMethod(String.class, "toString");
|
||||
|
||||
testCases.add(helper, "pool/sub/Klass.method(I[Ljava/lang/String;Ljava/lang/Integer;[B[[D)V", NO_MATCH);
|
||||
|
||||
// These should be improved to parsing failed in the future
|
||||
testCases.add(helper, "*Klass*,*$method*::", NO_MATCH);
|
||||
testCases.add(helper, "*Klass *+*", NO_MATCH);
|
||||
testCases.add(helper, "*Klass*::*method*", NO_MATCH);
|
||||
|
||||
testCases.add(helper, "*,**", PARSING_FAILURE);
|
||||
testCases.add(helper, "*,*(I[Ljava/lang/String;Lj]ava/lang/Integer;[B[[D)V", PARSING_FAILURE);
|
||||
testCases.add(helper, "*,*)method*.", PARSING_FAILURE);
|
||||
testCases.add(helper, "{pool.subpack.Klass}* *", PARSING_FAILURE);
|
||||
testCases.add(helper, "*Klass met]hod/", PARSING_FAILURE);
|
||||
testCases.add(helper, "pool::su@%b::Klass* *)method.", PARSING_FAILURE);
|
||||
testCases.add(helper, "0pool/sub/Klass,*{method}*.(I[Ljava/lang/String;Lj]ava/lang/Integer;[B[[D)V", PARSING_FAILURE);
|
||||
testCases.add(helper, "*Klass nonexistent::)(I[Ljava/lang/String;Ljava/lang/Integer;[B[[D)V", PARSING_FAILURE);
|
||||
testCases.add(helper, "pool,su]b,Klass*,*)method*/", PARSING_FAILURE);
|
||||
testCases.add(helper, "_pool,sub,Klass*,met@%hod,(0)V", PARSING_FAILURE);
|
||||
|
||||
testCases.add(helper, "*.*", MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.*", MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helper", MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helper()", MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helper()V", MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helper()V;", NO_MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helper()I", NO_MATCH);
|
||||
testCases.add(helper, "MethodMatcherTest.helperX", NO_MATCH);
|
||||
testCases.add(helper, "MethodMatcherTestX.helper;", NO_MATCH);
|
||||
testCases.add(helper, "abc.*", NO_MATCH);
|
||||
testCases.add(helper, "*.abc", NO_MATCH);
|
||||
|
||||
testCases.add(getDate, "*.*", MATCH);
|
||||
testCases.add(getDate, "*.getDate", MATCH);
|
||||
testCases.add(getDate, "java/util/Date.getDate", MATCH);
|
||||
testCases.add(getDate, "java/util/Date.*", MATCH);
|
||||
|
||||
testCases.add(inner, "*.*", MATCH);
|
||||
testCases.add(inner, "MethodMatcherTest$TestCases.innerHelper", MATCH);
|
||||
testCases.add(inner, "MethodMatcherTest*.innerHelper", MATCH);
|
||||
testCases.add(inner, "MethodMatcherTest$*.innerHelper", MATCH);
|
||||
testCases.add(inner, "*$TestCases.innerHelper", MATCH);
|
||||
testCases.add(inner, "*TestCases.innerHelper", MATCH);
|
||||
testCases.add(inner, "TestCases.innerHelper", NO_MATCH);
|
||||
testCases.add(inner, "MethodMatcherTest.innerHelper", NO_MATCH);
|
||||
|
||||
testCases.add(toString, "*.*", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString", MATCH);
|
||||
testCases.add(toString, "java.lang.String::toString", MATCH);
|
||||
|
||||
testCases.add(toString, "java/lang/String::toString", PARSING_FAILURE);
|
||||
testCases.add(toString, "java.lang/String::toString", PARSING_FAILURE);
|
||||
testCases.add(toString, "java.lang/String.toString", PARSING_FAILURE);
|
||||
testCases.add(toString, "java::lang::String::toString", PARSING_FAILURE);
|
||||
|
||||
testCases.add(toString, "java/lang/String.toString(*)", PARSING_FAILURE);
|
||||
testCases.add(toString, "java/lang/String.toString(L*", PARSING_FAILURE);
|
||||
testCases.add(toString, "java/lang/String.toString*(lsd)l", NO_MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString(lsd)l", NO_MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString (", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()L", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()Lj", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()Ls", NO_MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString*(", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString* (", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString*(;", NO_MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString*();sf", NO_MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString*()Ljava/lang/String;", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString()Ljava/lang/String;", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()Ljava/lang/String;", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()Ljava/lang/String", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()L", MATCH);
|
||||
testCases.add(toString, "java/lang/String.toString ()I;", NO_MATCH);
|
||||
|
||||
testCases.add(toString, "*Internal.*", NO_MATCH);
|
||||
testCases.add(toString, "*Internal.**", PARSING_FAILURE);
|
||||
testCases.add(toString, "*Internal.***", PARSING_FAILURE);
|
||||
testCases.add(toString, "*Internal.*a**", PARSING_FAILURE);
|
||||
testCases.add(toString, "*Internal.**a*", PARSING_FAILURE);
|
||||
|
||||
testCases.add(toString, "java.lang.String::<init>(Ljava/lang/String;)V", NO_MATCH);
|
||||
testCases.add(toString, "java.lang.String::<clinit>(Ljava/lang/String;)V", NO_MATCH);
|
||||
testCases.add(toString, "java.lang.String::<init(Ljava/lang/String;)V", PARSING_FAILURE);
|
||||
testCases.add(toString, "java.lang.String::init>(Ljava/lang/String;)V", PARSING_FAILURE);
|
||||
|
||||
testCases.add(toString, "java/lang/String.toString()Ljava/lang/String;", MATCH);
|
||||
testCases.add(toString, "java/lang/Str<ing.toString()Ljava/lang/String;", PARSING_FAILURE);
|
||||
testCases.add(toString, "java/lang/Str>ing.toString()Ljava/lang/String;", PARSING_FAILURE);
|
||||
testCases.add(toString, "java/lang/<init>.toString()Ljava/lang/String;", PARSING_FAILURE);
|
||||
testCases.add(toString, "java/lang/<clinit>.toString()Ljava/lang/String;", PARSING_FAILURE);
|
||||
|
||||
int failures = 0;
|
||||
for (TestCase t : testCases) {
|
||||
System.out.println("Test case: " + t.pattern);
|
||||
if (!t.test()) {
|
||||
failures++;
|
||||
System.out.println(" * FAILED");
|
||||
}
|
||||
}
|
||||
if (failures != 0) {
|
||||
throw new Exception("There where " + failures + " failures in this test");
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String... args) throws Exception {
|
||||
MethodMatcherTest test = new MethodMatcherTest();
|
||||
test.test();
|
||||
}
|
||||
|
||||
public void helper() {
|
||||
|
||||
}
|
||||
|
||||
private static Method getMethod(Class klass, String name, Class<?>... parameterTypes) {
|
||||
try {
|
||||
return klass.getDeclaredMethod(name, parameterTypes);
|
||||
} catch (NoSuchMethodException | SecurityException e) {
|
||||
throw new RuntimeException("exception on getting method Helper." + name, e);
|
||||
}
|
||||
}
|
||||
|
||||
class TestCase {
|
||||
String pattern;
|
||||
Method testTarget;
|
||||
int expectedResult;
|
||||
|
||||
public TestCase(Method testTarget, String pattern, int expectedResult) {
|
||||
this.testTarget = testTarget;
|
||||
this.pattern = pattern;
|
||||
this.expectedResult = expectedResult;
|
||||
}
|
||||
|
||||
public String resultAsStr(int errorCode) {
|
||||
switch (errorCode) {
|
||||
case PARSING_FAILURE:
|
||||
return "Parsing failed";
|
||||
case NO_MATCH:
|
||||
return "No match";
|
||||
case MATCH:
|
||||
return "Match";
|
||||
default:
|
||||
return "Unknown error";
|
||||
}
|
||||
}
|
||||
|
||||
boolean test() {
|
||||
int result = WHITE_BOX.matchesMethod(testTarget, pattern);
|
||||
if (result != expectedResult) {
|
||||
System.out
|
||||
.println("FAIL Wrong result, Got: " + resultAsStr(result) + "\n TestCase: " + this.toString());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Method: '" + testTarget.toString() + "' Pattern: '" + pattern + "' Expected: "
|
||||
+ resultAsStr(expectedResult);
|
||||
}
|
||||
|
||||
public void innerHelper() {
|
||||
}
|
||||
}
|
||||
|
||||
class TestCases extends ArrayList<TestCase> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public boolean add(Method testTarget, String pattern, int expectedResult) {
|
||||
return super.add(new TestCase(testTarget, pattern, expectedResult));
|
||||
}
|
||||
|
||||
public void innerHelper() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ public class TestCompileCommand {
|
|||
|
||||
private static final String[][] ARGUMENTS = {
|
||||
{
|
||||
"-XX:CompileCommand=print,*01234567890123456789012345678901234567890123456789,*0123456789012345678901234567890123456789",
|
||||
"-XX:CompileCommand=print,*01234567890123456789012345678901234567890123456789.*0123456789012345678901234567890123456789",
|
||||
"-version"
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
option,com/oracle/Test.test,MyBoolOption1
|
||||
option,com/oracle/Test,test,MyBoolOption2
|
||||
option,com.oracle.Test::test,MyBoolOption3
|
||||
option,com/oracle/Test::test,MyBoolOption4
|
||||
option,com/oracle/Test.test,MyBoolOption5,MyBoolOption6
|
||||
option,com/oracle/Test,test,MyBoolOption7,MyBoolOption8
|
||||
option,com/oracle/Test.test(I),MyBoolOption9
|
||||
option,com/oracle/Test,test,(I),MyBoolOption10
|
||||
option,com.oracle.Test::test(I),MyBoolOption11
|
||||
option,com/oracle/Test::test(I),MyBoolOption12
|
||||
option,com/oracle/Test.test(I),MyBoolOption13,MyBoolOption14
|
||||
option,com/oracle/Test,test(I),MyBoolOption15,MyBoolOption16
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class CompilerConfigFileWarning {
|
|||
pb = ProcessTools.createJavaProcessBuilder("-XX:CompileCommandFile=hs_comp.txt", "-version");
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldContain("CompileCommand: unrecognized command");
|
||||
output.shouldContain("aaa aaa");
|
||||
output.shouldContain("aaa, aaa");
|
||||
|
||||
// Skip on debug builds since we'll always read the file there
|
||||
if (!Platform.isDebugBuild()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue