clang-tidy and env var

Author: kr-2003

CMakeLists.txt

@@ -314,6 +314,10 @@ add_definitions(${LLVM_DEFINITIONS_LIST})
 string(REGEX REPLACE "/build/lib/cmake/llvm$" "" LLVM_SOURCE_DIR "${LLVM_DIR}")
 add_definitions(-DLLVM_SOURCE_DIR="${LLVM_SOURCE_DIR}")
 
+if(DEFINED LLVM_BUILT_WITH_OOP_JIT)
+  add_definitions(-DLLVM_BUILT_WITH_OOP_JIT)
+endif()
+
 # If the llvm sources are present add them with higher priority.
 if (LLVM_BUILD_MAIN_SRC_DIR)
   # LLVM_INCLUDE_DIRS contains the include paths to both LLVM's source and

lib/CppInterOp/Compatibility.h

@@ -442,8 +442,8 @@ inline void codeComplete(std::vector<std::string>& Results,
 #if defined(LLVM_BUILT_WITH_OOP_JIT) && !defined(_WIN32)
 inline pid_t getExecutorPID() { return /*llvm*/ getLastLaunchedExecutorPID(); }
 
-inline pid_t getNthExecutorPID() {
-  return /*llvm*/ getNthLaunchedExecutorPID();
+inline pid_t getNthExecutorPID(int n) {
+  return /*llvm*/ getNthLaunchedExecutorPID(n);
 }
 #endif
 

lib/CppInterOp/CppInterOpInterpreter.h

@@ -44,7 +44,7 @@
 #endif
 #include <algorithm>
 #include <cstdio>
-#include <stdio.h>
+#include <memory>
 #include <utility>
 #include <vector>
 
@@ -160,9 +160,9 @@ class Interpreter {
     bool outOfProcess = false;
 
     bool initializeTempFiles() {
-      stdin_file.reset(tmpfile());
-      stdout_file.reset(tmpfile());
-      stderr_file.reset(tmpfile());
+      stdin_file.reset(tmpfile());  // NOLINT(cppcoreguidelines-owning-memory)
+      stdout_file.reset(tmpfile()); // NOLINT(cppcoreguidelines-owning-memory)
+      stderr_file.reset(tmpfile()); // NOLINT(cppcoreguidelines-owning-memory)
       return stdin_file && stdout_file && stderr_file;
     }
   };

unittests/CppInterOp/JitTest.cpp

@@ -98,8 +98,9 @@ TEST(Streams, StreamRedirectJIT) {
     printf("%s\n", "Hello World");
     fflush(stdout);
     )");
-  std::string _ = Cpp::EndStdStreamCapture();
+  std::string CapturedStringErr = Cpp::EndStdStreamCapture();
   std::string CapturedStringOut = Cpp::EndStdStreamCapture();
 
   EXPECT_STREQ(CapturedStringOut.c_str(), "Hello World\n");
+  EXPECT_STREQ(CapturedStringErr.c_str(), "");
 }

unittests/CppInterOp/Utils.cpp

@@ -8,6 +8,7 @@
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Sema/Lookup.h"
 #include "clang/Sema/Sema.h"
+#include "clang/Interpreter/PartialTranslationUnit.h"
 
 #include <algorithm>
 #include <string>