improve error messages in NativeImageGenerator.checkUniverse

Utowoo · Apr 18, 2018 · af5062c · af5062c
1 parent a3c6c6d
commit af5062c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -1193,8 +1193,9 @@ private void checkUniverse() {
                     if (declaredType.isInterface()) {
                         state = TypeState.forSubtraction(bigbang, state, declaredType.getTypeFlow(bigbang, true).getState());
                         if (!state.isEmpty()) {
-                            bigbang.getUnsupportedFeatures().addMessage(method.format("%H.%n(%p)"), method,
-                                            "Method parameter " + i + " has declaredType " + declaredType.toJavaName(true) + " and incompatible types in state: " + state);
+                            String methodKey = method.format("%H.%n(%p)");
+                            bigbang.getUnsupportedFeatures().addMessage(methodKey, method,
+                                            "Parameter " + i + " of " + methodKey + " has declared type " + declaredType.toJavaName(true) + " which is incompatible with types in state: " + state);
                         }
                     }
                 }
@@ -1207,8 +1208,9 @@ private void checkUniverse() {
                 if (declaredType.isInterface()) {
                     state = TypeState.forSubtraction(bigbang, state, declaredType.getTypeFlow(bigbang, true).getState());
                     if (!state.isEmpty()) {
-                        bigbang.getUnsupportedFeatures().addMessage(field.format("%H.%n"), null,
-                                        "Field has declaredType " + declaredType.toJavaName(true) + " and incompatible types in state: " + state);
+                        String fieldKey = field.format("%H.%n");
+                        bigbang.getUnsupportedFeatures().addMessage(fieldKey, null,
+                                        "Field " + fieldKey + " has declared type " + declaredType.toJavaName(true) + " which is incompatible with types in state: " + state);
                     }
                 }
             }