Use valgrind's macro instead of LLVM's interface

Author: aaronj0

.github/workflows/ci.yml

@@ -744,7 +744,7 @@ jobs:
       run: |
         # Install deps
         sudo apt-get update
-        sudo apt-get install git g++ debhelper devscripts gnupg python3
+        sudo apt-get install git g++ debhelper devscripts gnupg python3 valgrind
         sudo apt-get install -y libc6-dbg
         sudo snap install valgrind --classic
         sudo apt autoremove

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -1,6 +1,5 @@
 #include "Utils.h"
 
-#include "llvm/Support/Valgrind.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Interpreter/CppInterOp.h"
 #include "clang/Frontend/CompilerInstance.h"
@@ -532,7 +531,7 @@ TEST(FunctionReflectionTest, ExistsFunctionTemplate) {
 }
 
 TEST(FunctionReflectionTest, InstantiateTemplateFunctionFromString) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
@@ -735,7 +734,7 @@ TEST(FunctionReflectionTest, IsStaticMethod) {
 }
 
 TEST(FunctionReflectionTest, GetFunctionAddress) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls, SubDecls;
   std::string code = "int f1(int i) { return i * i; }";
@@ -776,7 +775,7 @@ TEST(FunctionReflectionTest, IsVirtualMethod) {
 }
 
 TEST(FunctionReflectionTest, JitCallAdvanced) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
@@ -800,7 +799,7 @@ TEST(FunctionReflectionTest, JitCallAdvanced) {
 
 
 TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
@@ -1011,7 +1010,7 @@ TEST(FunctionReflectionTest, GetFunctionArgDefault) {
 }
 
 TEST(FunctionReflectionTest, Construct) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 
@@ -1047,7 +1046,7 @@ TEST(FunctionReflectionTest, Construct) {
 }
 
 TEST(FunctionReflectionTest, Destruct) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 

unittests/CppInterOp/InterpreterTest.cpp

@@ -1,10 +1,11 @@
-#include "clang/Interpreter/CppInterOp.h"
+#include "Utils.h"
 
+#include "clang/Interpreter/CppInterOp.h"
 #include "clang/Basic/Version.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/Valgrind.h"
+
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
 
@@ -44,7 +45,7 @@ TEST(InterpreterTest, DebugFlag) {
 }
 
 TEST(InterpreterTest, Evaluate) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   //  EXPECT_TRUE(Cpp::Evaluate(I, "") == 0);
   //EXPECT_TRUE(Cpp::Evaluate(I, "__cplusplus;") == 201402);
@@ -60,7 +61,7 @@ TEST(InterpreterTest, Evaluate) {
 }
 
 TEST(InterpreterTest, Process) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   EXPECT_TRUE(Cpp::Process("") == 0);

unittests/CppInterOp/JitTest.cpp

@@ -1,7 +1,6 @@
 #include "Utils.h"
 
 #include "clang/Interpreter/CppInterOp.h"
-#include "llvm/Support/Valgrind.h"
 
 #include "gtest/gtest.h"
 
@@ -13,7 +12,7 @@ static int printf_jit(const char* format, ...) {
 }
 
 TEST(JitTest, InsertOrReplaceJitSymbol) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -1,5 +1,5 @@
 #include "Utils.h"
-#include "llvm/Support/Valgrind.h"
+
 #include "clang/Interpreter/CppInterOp.h"
 
 #include "clang/AST/ASTContext.h"
@@ -800,7 +800,7 @@ template<typename T> T TrivialFnTemplate() { return T(); }
 }
 
 TEST(ScopeReflectionTest, InstantiateTemplateFunctionFromString) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
@@ -940,7 +940,8 @@ TEST(ScopeReflectionTest, GetClassTemplateInstantiationArgs) {
 
 
 TEST(ScopeReflectionTest, IncludeVector) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (RUNNING_ON_VALGRIND)
+      GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::string code = R"(
     #include <vector>
     #include <iostream>

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -1,6 +1,5 @@
 #include "Utils.h"
 
-#include "llvm/Support/Valgrind.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Interpreter/CppInterOp.h"
 #include "clang/Frontend/CompilerInstance.h"
@@ -524,7 +523,7 @@ TEST(TypeReflectionTest, IsPODType) {
 }
 
 TEST(TypeReflectionTest, IsSmartPtrType) {
-  if (llvm::sys::RunningOnValgrind())
+  if (RUNNING_ON_VALGRIND)
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 

unittests/CppInterOp/Utils.h

@@ -6,6 +6,15 @@
 #include <memory>
 #include <vector>
 
+// Include this to access the RUNNING_ON_VALGRIND directive to conditionally skip tests reporting memory issues
+
+#ifndef __APPLE__
+  #include <valgrind/valgrind.h>
+#endif //__APPLE__
+#ifdef __APPLE__
+  #define RUNNING_ON_VALGRIND 0
+#endif //__APPLE__
+
 using namespace clang;
 using namespace llvm;