Use DiagnosticsEngine to report error when RuntimePrintValue.h cannot be loaded.

Author: marsupial

lib/Interpreter/ValuePrinter.cpp

@@ -881,10 +881,14 @@ namespace cling {
                         const_cast<Transaction**>(&T));
         if (!T) {
           // Should also check T->getIssuedDiags() == Transaction::kErrors)?
-          
+
           // It's redundant, but nicer to see the error at the bottom.
           // if (!Trap.hasErrorOccurred())
-          cling::errs() << "RuntimePrintValue.h could not be loaded.\n";
+          clang::DiagnosticsEngine& Diag = Interp->getDiagnostics();
+          const unsigned ID = Diag.getCustomDiagID(
+                                     clang::DiagnosticsEngine::Level::Error,
+                                     "RuntimePrintValue.h could not be loaded");
+          Diag.Report(Interp->getSourceLocation(), ID);
           return kUndefined;
         }
       }

test/ErrorRecovery/ABI.C

@@ -6,19 +6,30 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cling -C -E -P  %s | %cling -nostdinc++ -Xclang -verify 2>&1 | FileCheck %s
-// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR %s | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %s
-// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR2 %s | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %s
-// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR3 %s | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cling -C -E -P  %s > %t
+// RUN: cat %t | %cling -nostdinc++ -Xclang -verify 2>&1 | FileCheck %t
 
+// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR %s > %t
+// RUN: cat %t | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %t
+
+// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR2 %s > %t
+// RUN: cat %t | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %t
+
+// RUN: %cling -C -E -P -DCLING_VALEXTRACT_ERR3 %s > %t
+// RUN: cat %t | %cling -nostdinc++ -nobuiltininc -Xclang -verify 2>&1 | FileCheck %t
+
+// RUN: %cling -C -E -P -DCLING_RTIME_PRNT_ERR %s > %t
+// RUN: cat %t | %cling -I%S/ABI -Xclang -verify 2>&1 | FileCheck %t
+
+#ifndef CLING_RTIME_PRNT_ERR
 // expected-error@input_line_1:1 {{'new' file not found}}
 
 //      CHECK: Warning in cling::IncrementalParser::CheckABICompatibility():
 // CHECK-NEXT:  Possible C++ standard library mismatch, compiled with {{.*$}}
-
+#endif
 
 #if defined(CLING_VALEXTRACT_ERR) || defined(CLING_VALEXTRACT_ERR2) || \
-    defined(CLING_VALEXTRACT_ERR3)
+    defined(CLING_VALEXTRACT_ERR3) || defined(CLING_RTIME_PRNT_ERR)
 
 struct Trigger {} Tr;
 
@@ -38,4 +49,9 @@ Tr // expected-error@2 {{ValueExtractionSynthesizer could not find: 'cling::runt
 
 #endif
 
+#ifdef CLING_RTIME_PRNT_ERR
+Tr // expected-error@cling/Interpreter/RuntimePrintValue.h:2 {{C++ requires a type specifier for all declarations}} expected-error@2 {{RuntimePrintValue.h could not be loaded}}
+// CHECK: (struct Trigger &) <undefined>
+#endif
+
 .q