Fixes for upstream merge.

Author: ptersilie

clang/include/clang/Driver/Options.td

@@ -6033,8 +6033,7 @@ defm inline_small_functions : BooleanFFlag<"inline-small-functions">,
 defm yk_noinline_funcs_with_loops : BoolOption<"f", "yk-noinline-funcs-with-loops",
   CodeGenOpts<"YkNoinlineFuncsWithLoops">, DefaultFalse,
   NegFlag<SetFalse, []>,
-  PosFlag<SetTrue, [], "Don't inline functions containing loops by default (used for the Yk JIT).">,
-  BothFlags<[CC1Option, CoreOption]>>;
+  PosFlag<SetTrue, [], [CC1Option, ClangOption], "Don't inline functions containing loops by default (used for the Yk JIT).">>;
 defm ipa_cp : BooleanFFlag<"ipa-cp">,
     Group<clang_ignored_gcc_optimization_f_Group>;
 defm ivopts : BooleanFFlag<"ivopts">, Group<clang_ignored_gcc_optimization_f_Group>;

llvm/lib/CodeGen/Yk/FixStackmapsSpillReloads.cpp

@@ -50,6 +50,8 @@
 #include "llvm/InitializePasses.h"
 #include "llvm/Support/Debug.h"
 
+#include <set>
+
 using namespace llvm;
 
 #define DEBUG_TYPE "fix-stackmaps-spill-reloads"

llvm/lib/Target/X86/X86AsmPrinter.cpp

@@ -45,6 +45,8 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
 
+#include <set>
+
 using namespace llvm;
 extern bool YkStackMapAdditionalLocs;
 

llvm/lib/YkIR/YkIRWriter.cpp

@@ -4,7 +4,6 @@
 //
 //===-------------------------------------------------------------------===//
 
-#include "llvm/ADT/Triple.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/IR/Constant.h"
 #include "llvm/IR/Constants.h"