Merge branch 'topic/422' into 'master'

lkql: improve ways errors messages are transmitted to the checker See merge request eng/libadalang/langkit-query-language!383
AdaCore · Jan 17, 2025 · 32d7df2 · 32d7df2
2 parents 40f2fa9 + 2b202bc
commit 32d7df2
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 5 deletions.
diff --git a/lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/GNATCheckWorker.java b/lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/GNATCheckWorker.java
@@ -223,7 +223,7 @@ protected int executeScript(Context.Builder contextBuilder) {
             try {
                 optionsBuilder.files(Files.readAllLines(Paths.get(this.args.filesFrom)));
             } catch (IOException e) {
-                System.err.println("Could not read file: " + this.args.filesFrom);
+                System.err.println("WORKER_ERROR: Could not read file: " + this.args.filesFrom);
             }
         }
 

diff --git a/...it/language/src/main/java/com/adacore/lkql_jit/checker/built_ins/NodeCheckerFunction.java b/...it/language/src/main/java/com/adacore/lkql_jit/checker/built_ins/NodeCheckerFunction.java
@@ -130,10 +130,13 @@ public Object executeGeneric(VirtualFrame frame) {
                         visitList.addFirst(new VisitStep(stubBody, true, inSparkCode));
                     }
                 } catch (Libadalang.LangkitException e) {
-                    context.println(
-                            StringUtils.concat(
-                                    "Error during generic instantiation walking: ",
-                                    e.getMessage()));
+                    context.getDiagnosticEmitter()
+                            .emitDiagnostic(
+                                    CheckerUtils.MessageKind.ERROR,
+                                    e.getMessage(),
+                                    new LalLocationWrapper(currentNode, context.linesCache),
+                                    new SourceSectionWrapper(this.callNode.getSourceSection()),
+                                    rootUnit.getFileName(true));
                     continue;
                 }
 

diff --git a/testsuite/tests/gnatcheck_errors/generic_inst_walking/prj.gpr b/testsuite/tests/gnatcheck_errors/generic_inst_walking/prj.gpr
@@ -0,0 +1,3 @@
+project Test is
+
+end Test;
diff --git a/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.adb b/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.adb
@@ -0,0 +1,5 @@
+procedure Test is
+   package I is new PP (4);
+begin
+   null;
+end;
diff --git a/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.out b/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.out
@@ -0,0 +1,37 @@
+Total gnatcheck failures: 1
+1. Summary
+
+   fully compliant sources               : 0
+   sources with exempted violations only : 0
+   sources with non-exempted violations  : 0
+   unverified sources                    : 1
+   total sources                         : 1
+   ignored sources                       : 0
+
+   non-exempted violations               : 0
+   rule exemption warnings               : 0
+   compilation errors                    : 0
+   exempted violations                   : 0
+   internal errors                       : 1
+
+2. Exempted Coding Standard Violations
+
+   no exempted violations detected
+
+3. Non-exempted Coding Standard Violations
+
+   no non-exempted violations detected
+
+4. Rule exemption problems
+
+   no rule exemption problems detected
+
+5. Language violations
+
+   no language violations detected
+
+6. Gnatcheck internal errors
+
+test.adb:2:04: error: internal issue at checker.lkql:4:22: test.adb:2:4-2:28: dereferencing a null access [/test.adb]
+
+>>>program returned status code 2
diff --git a/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.yaml b/testsuite/tests/gnatcheck_errors/generic_inst_walking/test.yaml
@@ -0,0 +1,4 @@
+driver: gnatcheck
+project: prj.gpr
+rules:
+  - +Rderiving_from_predefined_type