[patch] Fix ci for Cling v1.2

Author: aaronj0

.github/workflows/MacOS-arm.yml

@@ -166,6 +166,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -192,6 +193,7 @@ jobs:
                 -G Ninja                                           \
                 ../llvm
           ninja clang -j ${{ env.ncpus }}
+          ninja LLVMOrcDebugging -j ${{ env.ncpus }}
           ninja clingInterpreter -j ${{ env.ncpus }}
         else
           # Apply patches

.github/workflows/MacOS.yml

@@ -150,6 +150,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -176,6 +177,7 @@ jobs:
                 -G Ninja                                           \
                 ../llvm
           ninja clang -j ${{ env.ncpus }}
+          ninja LLVMOrcDebugging -j ${{ env.ncpus }}
           ninja clingInterpreter -j ${{ env.ncpus }}
         else
           # Apply patches

.github/workflows/Ubuntu-arm.yml

@@ -161,6 +161,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -187,6 +188,7 @@ jobs:
                 -G Ninja                                           \
                 ../llvm
           ninja clang -j ${{ env.ncpus }}
+          ninja LLVMOrcDebugging -j ${{ env.ncpus }}
           ninja clingInterpreter -j ${{ env.ncpus }}
         else
           # Apply patches

.github/workflows/Ubuntu.yml

@@ -154,6 +154,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -180,6 +181,7 @@ jobs:
                 -G Ninja                                           \
                 ../llvm
           ninja clang -j ${{ env.ncpus }}
+          ninja LLVMOrcDebugging -j ${{ env.ncpus }}
           ninja clingInterpreter -j ${{ env.ncpus }}
         else
           # Apply patches

.github/workflows/Windows-arm.yml

@@ -130,6 +130,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
           $env:PWD_DIR= $PWD.Path
@@ -162,6 +163,7 @@ jobs:
                 -DLLVM_ENABLE_LIBXML2=OFF                          `
                 ..\llvm
           cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
+          cmake --build . --config Release --target LLVMOrcDebugging --parallel ${{ env.ncpus }}
           cmake --build . --config Release --target clingInterpreter --parallel ${{ env.ncpus }}
         }
         else

.github/workflows/Windows.yml

@@ -130,6 +130,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
           $env:PWD_DIR= $PWD.Path
@@ -162,6 +163,7 @@ jobs:
                 -DLLVM_ENABLE_LIBXML2=OFF                          `
                 ..\llvm
           cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
+          cmake --build . --config Release --target LLVMOrcDebugging --parallel ${{ env.ncpus }}
           cmake --build . --config Release --target clingInterpreter --parallel ${{ env.ncpus }}
         }
         else

.github/workflows/emscripten.yml

@@ -211,6 +211,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -304,6 +305,7 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling
           git checkout tags/v${{ matrix.cling-version }}
+          git apply -v ../patches/llvm/cling1.2-LookupHelper.patch
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
           $env:PWD_DIR= $PWD.Path

patches/llvm/cling1.2-LookupHelper.patch

@@ -0,0 +1,42 @@
+diff --git a/include/cling/Interpreter/LookupHelper.h b/include/cling/Interpreter/LookupHelper.h
+index 6e6e2814..cd79b2a6 100644
+--- a/include/cling/Interpreter/LookupHelper.h
++++ b/include/cling/Interpreter/LookupHelper.h
+@@ -56,7 +56,7 @@ namespace cling {
+       WithDiagnostics
+     };
+   private:
+-    std::unique_ptr<clang::Parser> m_Parser;
++    clang::Parser* m_Parser;
+     Interpreter* m_Interpreter; // we do not own.
+     std::array<const clang::Type*, kNumCachedStrings> m_StringTy = {{}};
+     /// A map containing the hash of the lookup buffer. This allows us to avoid
+diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp
+index 6af90108..89ca360b 100644
+--- a/lib/Interpreter/Interpreter.cpp
++++ b/lib/Interpreter/Interpreter.cpp
+@@ -265,13 +265,6 @@ namespace cling {
+     }
+ 
+     Sema& SemaRef = getSema();
+-    Preprocessor& PP = SemaRef.getPreprocessor();
+-
+-    m_LookupHelper.reset(new LookupHelper(new Parser(PP, SemaRef,
+-                                                     /*SkipFunctionBodies*/false,
+-                                                     /*isTemp*/true), this));
+-    if (!m_LookupHelper)
+-      return;
+ 
+     if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) {
+       m_Executor.reset(new IncrementalExecutor(SemaRef.Diags, *getCI(),
+@@ -317,6 +310,10 @@ namespace cling {
+       return;
+     }
+ 
++    m_LookupHelper.reset(new LookupHelper(m_IncrParser->getParser(), this));
++    if (!m_LookupHelper)
++      return;
++
+     // When not using C++ modules, we now have a PCH and we can safely setup
+     // our callbacks without fearing that they get overwritten by clang code.
+     // The modules setup is handled above.