Mercurial > hg > truffle
changeset 22326:6cec0097107f
added workaround based on JDK-8075793 to allow compilation with JDK9 javac
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 26 Oct 2015 13:28:19 +0100 |
parents | 414e82b9fc35 |
children | 4a43dc00a654 |
files | truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JDTCompiler.java truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java |
diffstat | 3 files changed, 36 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JDTCompiler.java Fri Oct 23 20:23:00 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/compiler/JDTCompiler.java Mon Oct 26 13:28:19 2015 +0100 @@ -23,6 +23,7 @@ package com.oracle.truffle.dsl.processor.java.compiler; import com.oracle.truffle.dsl.processor.java.ElementUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -31,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; + import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -47,13 +49,20 @@ } } + /** + * @see "https://bugs.openjdk.java.net/browse/JDK-8039214" + */ + private static List<Element> newElementList(List<? extends Element> src) { + List<Element> workaround = new ArrayList<>(src); + return workaround; + } + public List<? extends Element> getAllMembersInDeclarationOrder(ProcessingEnvironment environment, TypeElement type) { - return sortBySourceOrder(new ArrayList<>(environment.getElementUtils().getAllMembers(type))); - + return sortBySourceOrder(newElementList(environment.getElementUtils().getAllMembers(type))); } public List<? extends Element> getEnclosedElementsInDeclarationOrder(TypeElement type) { - return sortBySourceOrder(new ArrayList<>(type.getEnclosedElements())); + return sortBySourceOrder(newElementList(type.getEnclosedElements())); } private static List<? extends Element> sortBySourceOrder(List<Element> elements) {
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Fri Oct 23 20:23:00 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Mon Oct 26 13:28:19 2015 +0100 @@ -66,6 +66,7 @@ import com.oracle.truffle.dsl.processor.model.SpecializationThrowsData; import com.oracle.truffle.dsl.processor.model.TemplateMethod; import com.oracle.truffle.dsl.processor.model.TypeSystemData; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; @@ -79,6 +80,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -304,9 +306,7 @@ } private List<Element> loadMembers(TypeElement templateType) { - List<Element> members = new ArrayList<>(CompilerFactory.getCompiler(templateType).getAllMembersInDeclarationOrder(context.getEnvironment(), templateType)); - - return members; + return newElementList(CompilerFactory.getCompiler(templateType).getAllMembersInDeclarationOrder(context.getEnvironment(), templateType)); } private boolean containsSpecializations(List<Element> elements) { @@ -1276,7 +1276,7 @@ private static List<Element> filterNotAccessibleElements(TypeElement templateType, List<? extends Element> elements) { String packageName = ElementUtils.getPackageName(templateType); - List<Element> filteredElements = new ArrayList<>(elements); + List<Element> filteredElements = newElementList(elements); for (Element element : elements) { Modifier visibility = ElementUtils.getVisibility(element.getModifiers()); if (visibility == Modifier.PRIVATE) { @@ -1599,6 +1599,14 @@ } } + /** + * @see "https://bugs.openjdk.java.net/browse/JDK-8039214" + */ + private static List<Element> newElementList(List<? extends Element> src) { + List<Element> workaround = new ArrayList<>(src); + return workaround; + } + private static void verifyMissingAbstractMethods(NodeData nodeData, List<? extends Element> originalElements) { if (!nodeData.needsFactory()) { // missing abstract methods only needs to be implemented @@ -1606,7 +1614,7 @@ return; } - List<Element> elements = new ArrayList<>(originalElements); + List<Element> elements = newElementList(originalElements); Set<Element> unusedElements = new HashSet<>(elements); for (ExecutableElement method : nodeData.getAllTemplateMethods()) { unusedElements.remove(method);
--- a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java Fri Oct 23 20:23:00 2015 +0200 +++ b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java Mon Oct 26 13:28:19 2015 +0100 @@ -32,6 +32,7 @@ import com.oracle.truffle.dsl.processor.model.TypeCastData; import com.oracle.truffle.dsl.processor.model.TypeCheckData; import com.oracle.truffle.dsl.processor.model.TypeSystemData; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; @@ -40,6 +41,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -60,6 +62,14 @@ return TypeSystem.class; } + /** + * @see "https://bugs.openjdk.java.net/browse/JDK-8039214" + */ + private static List<Element> newElementList(List<? extends Element> src) { + List<Element> workaround = new ArrayList<>(src); + return workaround; + } + @Override protected TypeSystemData parse(Element element, AnnotationMirror mirror) { TypeElement templateType = (TypeElement) element; @@ -94,7 +104,7 @@ verifyExclusiveMethodAnnotation(typeSystem, TypeCast.class, TypeCheck.class); - List<Element> elements = new ArrayList<>(context.getEnvironment().getElementUtils().getAllMembers(templateType)); + List<Element> elements = newElementList(context.getEnvironment().getElementUtils().getAllMembers(templateType)); List<ImplicitCastData> implicitCasts = new ImplicitCastParser(context, typeSystem).parse(elements); List<TypeCastData> casts = new TypeCastParser(context, typeSystem).parse(elements); List<TypeCheckData> checks = new TypeCheckParser(context, typeSystem).parse(elements);