[llvm] f51d7e4 - Fix the implicit module build

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2022-03-14T09:24:17-07:00
New Revision: f51d7e4bae9e861e711ad9711599456fc2f1bbca

URL: https://github.com/llvm/llvm-project/commit/f51d7e4bae9e861e711ad9711599456fc2f1bbca
DIFF: https://github.com/llvm/llvm-project/commit/f51d7e4bae9e861e711ad9711599456fc2f1bbca.diff

LOG: Fix the implicit module build

This fixes the implicit module build after b1b4b6f36695 broke the LLDB
build: https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/42084/

Added: 
    

Modified: 
    clang/include/clang/Basic/BuiltinsVE.def
    llvm/include/llvm/CodeGen/MachinePipeliner.h

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Basic/BuiltinsVE.def b/clang/include/clang/Basic/BuiltinsVE.def
index 1cb5250893819..29b2bd203ef0f 100644
--- a/clang/include/clang/Basic/BuiltinsVE.def
+++ b/clang/include/clang/Basic/BuiltinsVE.def
@@ -11,7 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if defined(BUILTIN) && !defined(TARGET_BUILTIN)
+#   define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS)
+#endif
+
 // Use generated BUILTIN definitions
 #include "clang/Basic/BuiltinsVEVL.gen.def"
 
 #undef BUILTIN
+#undef TARGET_BUILTIN

diff  --git a/llvm/include/llvm/CodeGen/MachinePipeliner.h b/llvm/include/llvm/CodeGen/MachinePipeliner.h
index 7e7fa57d80da6..63024562bd2d3 100644
--- a/llvm/include/llvm/CodeGen/MachinePipeliner.h
+++ b/llvm/include/llvm/CodeGen/MachinePipeliner.h
@@ -40,6 +40,7 @@
 #ifndef LLVM_CODEGEN_MACHINEPIPELINER_H
 #define LLVM_CODEGEN_MACHINEPIPELINER_H
 
+#include "llvm/ADT/SetVector.h"
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h"
 #include "llvm/CodeGen/RegisterClassInfo.h"