OpenJDK / amber / amber
changeset 57009:c91c71a053ad patterns
Fixing a few tests.
| author | jlahoda |
|---|---|
| date | Tue, 20 Aug 2019 15:59:21 +0200 |
| parents | d67b52fc90b2 |
| children | d2da9cce7a04 a898dc684456 |
| files | src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java test/langtools/tools/javac/patterns/ConstantPatternTest2.out test/langtools/tools/javac/patterns/NullsInPatterns2.out |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Tue Aug 20 10:59:45 2019 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Tue Aug 20 15:59:21 2019 +0200 @@ -3840,8 +3840,10 @@ chk.checkTransparentVar(tree.pos(), v, env.info.scope); // env.info.scope.enter(v); // we inject into scopes expressly at various points. } - annotate.queueScanTreeAndTypeAnnotate(tree.vartype, env, v, tree.pos()); - annotate.flush(); + if (tree.vartype != null) { + annotate.queueScanTreeAndTypeAnnotate(tree.vartype, env, v, tree.pos()); + annotate.flush(); + } result = tree.type; }
--- a/test/langtools/tools/javac/patterns/ConstantPatternTest2.out Tue Aug 20 10:59:45 2019 +0200 +++ b/test/langtools/tools/javac/patterns/ConstantPatternTest2.out Tue Aug 20 15:59:21 2019 +0200 @@ -18,7 +18,7 @@ ConstantPatternTest2.java:83:32: compiler.err.expected: ';' ConstantPatternTest2.java:87:28: compiler.err.illegal.start.of.type ConstantPatternTest2.java:87:30: compiler.err.expected: ';' -ConstantPatternTest2.java:91:17: compiler.err.var.not.allowed +ConstantPatternTest2.java:91:17: compiler.err.restricted.type.not.allowed: var, 10 ConstantPatternTest2.java:95:28: compiler.err.illegal.start.of.type ConstantPatternTest2.java:95:30: compiler.err.expected: ';' ConstantPatternTest2.java:97:28: compiler.err.illegal.start.of.type
--- a/test/langtools/tools/javac/patterns/NullsInPatterns2.out Tue Aug 20 10:59:45 2019 +0200 +++ b/test/langtools/tools/javac/patterns/NullsInPatterns2.out Tue Aug 20 15:59:21 2019 +0200 @@ -1,4 +1,4 @@ -NullsInPatterns2.java:33:18: compiler.err.var.not.allowed +NullsInPatterns2.java:33:18: compiler.err.restricted.type.not.allowed: var, 10 NullsInPatterns2.java:35:29: compiler.err.illegal.start.of.type NullsInPatterns2.java:35:33: compiler.err.expected: ';' 3 errors