--- a/test/langtools/tools/javac/sym/ElementStructureTest.java Fri Jun 14 01:09:45 2019 +0200
+++ b/test/langtools/tools/javac/sym/ElementStructureTest.java Thu Jun 13 16:39:20 2019 -0700
@@ -409,7 +409,7 @@
for (VariableElement param : e.getParameters()) {
visit(param, p);
}
- out.write(String.valueOf(e.getReceiverType()));
+ out.write(String.valueOf(typeMirrorTranslate(e.getReceiverType())));
write(e.getReturnType());
out.write(e.getSimpleName().toString());
writeTypes(e.getThrownTypes());
@@ -425,6 +425,18 @@
return null;
}
+ /**
+ * Original implementation of getReceiverType returned null
+ * for many cases where TypeKind.NONE was specified; translate
+ * back to null to compare against old hashes.
+ */
+ private TypeMirror typeMirrorTranslate(TypeMirror type) {
+ if (type.getKind() == javax.lang.model.type.TypeKind.NONE)
+ return null;
+ else
+ return type;
+ }
+
@Override
public Void visitPackage(PackageElement e, Void p) {
List<Element> types = new ArrayList<>(e.getEnclosedElements());