Mercurial > hg > truffle

changeset 16027:5da8c17a9767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve error reporting for NodeIntrinsic signature mismatch
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Tue, 03 Jun 2014 18:15:43 -0700
parents 5f3c8ebf4940
children bca2ed3b97fd
files graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java	Tue Jun 03 17:48:38 2014 -0700
+++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java	Tue Jun 03 18:15:43 2014 -0700
@@ -124,6 +124,7 @@
 
     private void findConstructor(TypeElement nodeClass, TypeMirror[] signature, ExecutableElement intrinsicMethod, AnnotationMirror intrinsicAnnotation) {
         List<ExecutableElement> constructors = ElementFilter.constructorsIn(nodeClass.getEnclosedElements());
+        List<String> failureReasons = new ArrayList<>();
 
         nextConstructor: for (ExecutableElement constructor : constructors) {
             int sIdx = 0;
@@ -141,13 +142,16 @@
                     TypeMirror varargsType = ((ArrayType) paramType).getComponentType();
                     while (sIdx < signature.length) {
                         if (!isTypeCompatible(varargsType, signature[sIdx++])) {
+                            failureReasons.add(String.format("Constructor %s failed because the types of argument %d are incompatible: %s != %s", constructor, sIdx, varargsType, signature[sIdx - 1]));
                             continue nextConstructor;
                         }
                     }
                 } else if (sIdx >= signature.length) {
                     // too many arguments in intrinsic method
+                    failureReasons.add(String.format("Too many arguments for %s", constructor));
                     continue nextConstructor;
                 } else if (!isTypeCompatible(paramType, signature[sIdx++])) {
+                    failureReasons.add(String.format("Constructor %s failed because the types of argument %d are incompatible: %s != %s", constructor, sIdx, paramType, signature[sIdx - 1]));
                     continue nextConstructor;
                 }
             }
@@ -158,10 +162,17 @@
             }
 
             // too many arguments in constructor
+            failureReasons.add(String.format("Not enough arguments for %s", constructor));
         }
 
         // not found
-        env.getMessager().printMessage(Kind.ERROR, "Could not find matching constructor for node intrinsic.", intrinsicMethod, intrinsicAnnotation);
+        if (failureReasons.isEmpty()) {
+            env.getMessager().printMessage(Kind.ERROR, "Could not find matching constructor for node intrinsic.", intrinsicMethod, intrinsicAnnotation);
+        } else {
+            for (String reason : failureReasons) {
+                env.getMessager().printMessage(Kind.ERROR, reason, intrinsicMethod, intrinsicAnnotation);
+            }
+        }
     }
 
     private boolean isTypeCompatible(TypeMirror originalType, TypeMirror substitutionType) {