Mercurial > hg > truffle

changeset 9224:b69312e4eceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fix for private template types.
author Christian Humer <christian.humer@gmail.com>
date Sat, 20 Apr 2013 12:22:54 +0200
parents 5f7f0d3e3638
children 9d29e5aa54d2
files graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java	Sat Apr 20 12:17:47 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java	Sat Apr 20 12:22:54 2013 +0200
@@ -144,6 +144,10 @@
         if (specializations == null) {
             return false;
         }
+        if (getTemplateType().getModifiers().contains(Modifier.PRIVATE)) {
+            return false;
+        }
+
         boolean noSpecialization = true;
         for (SpecializationData specialization : specializations) {
             noSpecialization = noSpecialization && specialization.isGeneric() || specialization.isUninitialized();
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java	Sat Apr 20 12:17:47 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java	Sat Apr 20 12:22:54 2013 +0200
@@ -128,16 +128,10 @@
         }
 
         AnnotationMirror methodNodes = Utils.findAnnotationMirror(processingEnv, templateType, NodeClass.class);
-
         if (methodNodes == null && !Utils.isAssignable(templateType.asType(), context.getTruffleTypes().getNode())) {
             return null; // not a node
         }
 
-        if (templateType.getModifiers().contains(Modifier.PRIVATE)) {
-            // TODO error message here!?
-            return null; // not visible, not a node
-        }
-
         List<TypeElement> lookupTypes = findSuperClasses(new ArrayList<TypeElement>(), templateType);
         Collections.reverse(lookupTypes);