llvm-8.0-u3.patch (2209B)
1 diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h 2 index 9e3478e9fd2..f54e8d161e0 100644 3 --- a/include/llvm/Demangle/MicrosoftDemangleNodes.h 4 +++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h 5 @@ -4,6 +4,8 @@ 6 #include "llvm/Demangle/Compiler.h" 7 #include "llvm/Demangle/StringView.h" 8 #include <array> 9 +#include <cstdint> 10 +#include <string> 11 12 class OutputStream; 13 14 @@ -602,4 +604,4 @@ struct FunctionSymbolNode : public SymbolNode { 15 } // namespace ms_demangle 16 } // namespace llvm 17 18 -#endif 19 \ No newline at end of file 20 +#endif 21 diff --git a/lib/CodeGen/AsmPrinter/WinException.cpp b/lib/CodeGen/AsmPrinter/WinException.cpp 22 index 92df09b7d6a..049e35eeceb 100644 23 --- a/lib/CodeGen/AsmPrinter/WinException.cpp 24 +++ b/lib/CodeGen/AsmPrinter/WinException.cpp 25 @@ -734,7 +734,7 @@ void WinException::emitCXXFrameHandler3Table(const MachineFunction *MF) { 26 OS.EmitIntValue(0, 4); 27 28 AddComment("EHFlags"); 29 - OS.EmitIntValue(1, 4); 30 + OS.EmitIntValue(0, 4); 31 32 // UnwindMapEntry { 33 // int32_t ToState; 34 diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp 35 index 4663de0b049..cf5ef51f2ff 100644 36 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp 37 +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp 38 @@ -893,7 +893,11 @@ promoteArguments(Function *F, function_ref<AAResults &(Function &F)> AARGetter, 39 // add it to ArgsToPromote. 40 SmallPtrSet<Argument *, 8> ArgsToPromote; 41 SmallPtrSet<Argument *, 8> ByValArgsToTransform; 42 + bool first = true; 43 for (Argument *PtrArg : PointerArgs) { 44 + if (first && F->getCallingConv() == CallingConv::X86_ThisCall) continue; 45 + first = false; 46 + 47 Type *AgTy = cast<PointerType>(PtrArg->getType())->getElementType(); 48 49 // Replace sret attribute with noalias. This reduces register pressure by 50 diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h 51 index 0705e219f2f..4caa5ad4da0 100644 52 --- a/utils/benchmark/src/benchmark_register.h 53 +++ b/utils/benchmark/src/benchmark_register.h 54 @@ -1,6 +1,7 @@ 55 #ifndef BENCHMARK_REGISTER_H 56 #define BENCHMARK_REGISTER_H 57 58 +#include <limits> 59 #include <vector> 60 61 #include "check.h"