stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8266819: Separate the stop policies from the compile policies completely

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Guoxiong Li 2021-05-13 10:22:13 +00:00 committed by Maurizio Cimadamore
parent a270cbe2eb
commit 17ceef97c3
9 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
View File

@ -160,17 +160,6 @@ public class JavaCompiler {
* it does not depend on any unrelated errors that might have occurred.
*/
protected static enum CompilePolicy {
/**
* Just attribute the parse trees.
*/
ATTR_ONLY,
/**
* Just attribute and do flow analysis on the parse trees.
* This should catch most user errors.
*/
CHECK_ONLY,
/**
* Attribute everything, then do flow analysis for everything,
* then desugar everything, and only then generate output.
@ -198,10 +187,6 @@ public class JavaCompiler {
static CompilePolicy decode(String option) {
if (option == null)
return DEFAULT_COMPILE_POLICY;
else if (option.equals("attr"))
return ATTR_ONLY;
else if (option.equals("check"))
return CHECK_ONLY;
else if (option.equals("simple"))
return SIMPLE;
else if (option.equals("byfile"))
@ -443,11 +428,7 @@ public class JavaCompiler {
verboseCompilePolicy = options.isSet("verboseCompilePolicy");
if (options.isSet("should-stop.at") &&
CompileState.valueOf(options.get("should-stop.at")) == CompileState.ATTR)
compilePolicy = CompilePolicy.ATTR_ONLY;
else
compilePolicy = CompilePolicy.decode(options.get("compilePolicy"));
compilePolicy = CompilePolicy.decode(options.get("compilePolicy"));
implicitSourcePolicy = ImplicitSourcePolicy.decode(options.get("-implicit"));
@ -948,14 +929,6 @@ public class JavaCompiler {
if (!CompileState.ATTR.isAfter(shouldStopPolicyIfNoError)) {
switch (compilePolicy) {
case ATTR_ONLY:
attribute(todo);
break;
case CHECK_ONLY:
flow(attribute(todo));
break;
case SIMPLE:
generate(desugar(flow(attribute(todo))));
break;

10
test/langtools/tools/javac/6199662/Tree.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2021, 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
@ -38,11 +38,11 @@
* @compile -XDcompilePolicy=simple Tree.java TreeScanner.java TreeInfo.java
* @compile -XDcompilePolicy=simple TreeInfo.java TreeScanner.java Tree.java
*
* @compile -XDcompilePolicy=check Tree.java TreeScanner.java TreeInfo.java
* @compile -XDcompilePolicy=check TreeInfo.java TreeScanner.java Tree.java
* @compile -XDshould-stop.ifError=FLOW -XDshould-stop.ifNoError=FLOW Tree.java TreeScanner.java TreeInfo.java
* @compile -XDshould-stop.ifError=FLOW -XDshould-stop.ifNoError=FLOW TreeInfo.java TreeScanner.java Tree.java
*
* @compile -XDcompilePolicy=attr Tree.java TreeScanner.java TreeInfo.java
* @compile -XDcompilePolicy=attr TreeInfo.java TreeScanner.java Tree.java
* @compile -XDshould-stop.ifError=ATTR -XDshould-stop.ifNoError=ATTR Tree.java TreeScanner.java TreeInfo.java
* @compile -XDshould-stop.ifError=ATTR -XDshould-stop.ifNoError=ATTR TreeInfo.java TreeScanner.java Tree.java
*/
package p;

5
test/langtools/tools/javac/failover/CheckAttributedTree.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2021, 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
@ -315,7 +315,8 @@ public class CheckAttributedTree {
totalNumberOfCompilations++;
newCompilationTask()
.withWriter(pw)
.withOption("--should-stop=at=ATTR")
.withOption("--should-stop=ifError=ATTR")
.withOption("--should-stop=ifNoError=ATTR")
.withOption("-XDverboseCompilePolicy")
.withOption("-Xdoclint:none")
.withSource(files.iterator().next())

5
test/langtools/tools/javac/importscope/T8193717.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2021, 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
@ -94,7 +94,8 @@ public class T8193717 {
try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
fm.setLocationFromPaths(StandardLocation.CLASS_OUTPUT, List.of(Paths.get(".")));
new JavacTask(tb).sources(source)
.options("-XDshould-stop.at=ATTR") //the source is too big for a classfile
.options("-XDshould-stop.ifError=ATTR",
"-XDshould-stop.ifNoError=ATTR") //the source is too big for a classfile
.fileManager(new TestJFM(fm))
.run();
}

2
test/langtools/tools/javac/lambda/MostSpecific09.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8029718 8065800
* @summary Should always use lambda body structure to disambiguate overload resolution
* @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop=at=ATTR --debug=verboseResolution=applicable,success MostSpecific09.java
* @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop=ifError=ATTR --should-stop=ifNoError=ATTR --debug=verboseResolution=applicable,success MostSpecific09.java
*/
class MostSpecific09 {

3
test/langtools/tools/javac/modules/AnnotationProcessing.java
View File

@ -1716,7 +1716,8 @@ public class AnnotationProcessing extends ModuleTestBase {
"-AlookupClass=+test.Test",
"-AlookupPackage=+test",
"--add-modules=m2x",
"-XDshould-stop.at=ATTR",
"-XDshould-stop.ifError=ATTR",
"-XDshould-stop.ifNoError=ATTR",
"-XDrawDiagnostics")
.outdir(srcClasses)
.files(findJavaFiles(src))

8
test/langtools/tools/javac/resolve/ResolveHarness.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021, 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
@ -131,9 +131,9 @@ public class ResolveHarness implements javax.tools.DiagnosticListener<JavaFileOb
}
protected void check() throws Exception {
String[] options = {
"--should-stop=at=ATTR",
"--debug=verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"
String[][] options = {
{"--should-stop=ifError=ATTR", "--should-stop=ifNoError=ATTR"},
{"--debug=verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"}
};
AbstractProcessor[] processors = { new ResolveCandidateFinder(), null };

2
test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8223305 8226522
* @summary Verify correct warnings w.r.t. yield
* @compile/ref=WarnWrongYieldTest.out -Xlint:-options -source 13 -XDrawDiagnostics -XDshould-stop.at=ATTR WarnWrongYieldTest.java
* @compile/ref=WarnWrongYieldTest.out -Xlint:-options -source 13 -XDrawDiagnostics -XDshould-stop.ifError=ATTR -XDshould-stop.ifNoError=ATTR WarnWrongYieldTest.java
*/
package t;

2
test/langtools/tools/javac/switchexpr/WrongYieldTest.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8223305 8226522
* @summary Ensure proper errors are returned for yields.
* @compile/fail/ref=WrongYieldTest.out -XDrawDiagnostics -XDshould-stop.at=ATTR WrongYieldTest.java
* @compile/fail/ref=WrongYieldTest.out -XDrawDiagnostics -XDshould-stop.ifError=ATTR -XDshould-stop.ifNoError=ATTR WrongYieldTest.java
*/
package t;