Automatic merge of jdk:master into master

duke · duke · commit c60411f9a295 · 2020-08-19T16:54:43.000Z
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, 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
@@ -326,7 +326,7 @@ public String getText() {
         }
     }
 
-    public static class DCEndElement extends DCEndPosTree<DCStartElement> implements EndElementTree {
+    public static class DCEndElement extends DCEndPosTree<DCEndElement> implements EndElementTree {
         public final Name name;
 
         DCEndElement(Name name) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -326,7 +326,7 @@ public String getText() {`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`
`329`		`- public static class DCEndElement extends DCEndPosTree<DCStartElement> implements EndElementTree {`
	`329`	`+ public static class DCEndElement extends DCEndPosTree<DCEndElement> implements EndElementTree {`
`330`	`330`	`public final Name name;`
`331`	`331`
`332`	`332`	`DCEndElement(Name name) {`