1 files changed, 8 insertions, 9 deletions
diff --git a/llvm/tools/lli/ChildTarget/ChildTarget.cpp b/llvm/tools/lli/ChildTarget/ChildTarget.cpp
index b7dcaaa3ea9..1a6cd4211d0 100644
--- a/llvm/tools/lli/ChildTarget/ChildTarget.cpp
+++ b/llvm/tools/lli/ChildTarget/ChildTarget.cpp
@@ -17,6 +17,8 @@ typedef OrcX86_64 HostOrcArch;
 typedef OrcGenericArchitecture HostOrcArch;
 #endif
 
+ExitOnError ExitOnErr;
+
 int main(int argc, char *argv[]) {
 
   if (argc != 3) {
@@ -24,6 +26,8 @@ int main(int argc, char *argv[]) {
     return 1;
   }
 
+  ExitOnErr.setBanner(std::string(argv[0]) + ":");
+
   int InFD;
   int OutFD;
   {
@@ -55,20 +59,15 @@ int main(int argc, char *argv[]) {
 
   while (1) {
     uint32_t RawId;
-    if (auto EC = Server.startReceivingFunction(Channel, RawId)) {
-      errs() << "Error: " << EC.message() << "\n";
-      return 1;
-    }
+    ExitOnErr(Server.startReceivingFunction(Channel, RawId));
     auto Id = static_cast<JITServer::JITFuncId>(RawId);
     switch (Id) {
     case JITServer::TerminateSessionId:
-      Server.handleTerminateSession();
+      ExitOnErr(Server.handleTerminateSession());
       return 0;
     default:
-      if (auto EC = Server.handleKnownFunction(Id)) {
-        errs() << "Error: " << EC.message() << "\n";
-        return 1;
-      }
+      ExitOnErr(Server.handleKnownFunction(Id));
+      break;
     }
   }