You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
|
index 9e3478e9fd2..f54e8d161e0 100644
|
|
--- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
|
+++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
|
@@ -4,6 +4,8 @@
|
|
#include "llvm/Demangle/Compiler.h"
|
|
#include "llvm/Demangle/StringView.h"
|
|
#include <array>
|
|
+#include <cstdint>
|
|
+#include <string>
|
|
|
|
class OutputStream;
|
|
|
|
@@ -602,4 +604,4 @@ struct FunctionSymbolNode : public SymbolNode {
|
|
} // namespace ms_demangle
|
|
} // namespace llvm
|
|
|
|
-#endif
|
|
\ No newline at end of file
|
|
+#endif
|
|
diff --git a/lib/CodeGen/AsmPrinter/WinException.cpp b/lib/CodeGen/AsmPrinter/WinException.cpp
|
|
index 92df09b7d6a..049e35eeceb 100644
|
|
--- a/lib/CodeGen/AsmPrinter/WinException.cpp
|
|
+++ b/lib/CodeGen/AsmPrinter/WinException.cpp
|
|
@@ -734,7 +734,7 @@ void WinException::emitCXXFrameHandler3Table(const MachineFunction *MF) {
|
|
OS.EmitIntValue(0, 4);
|
|
|
|
AddComment("EHFlags");
|
|
- OS.EmitIntValue(1, 4);
|
|
+ OS.EmitIntValue(0, 4);
|
|
|
|
// UnwindMapEntry {
|
|
// int32_t ToState;
|
|
diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp
|
|
index 4663de0b049..cf5ef51f2ff 100644
|
|
--- a/lib/Transforms/IPO/ArgumentPromotion.cpp
|
|
+++ b/lib/Transforms/IPO/ArgumentPromotion.cpp
|
|
@@ -893,7 +893,11 @@ promoteArguments(Function *F, function_ref<AAResults &(Function &F)> AARGetter,
|
|
// add it to ArgsToPromote.
|
|
SmallPtrSet<Argument *, 8> ArgsToPromote;
|
|
SmallPtrSet<Argument *, 8> ByValArgsToTransform;
|
|
+ bool first = true;
|
|
for (Argument *PtrArg : PointerArgs) {
|
|
+ if (first && F->getCallingConv() == CallingConv::X86_ThisCall) continue;
|
|
+ first = false;
|
|
+
|
|
Type *AgTy = cast<PointerType>(PtrArg->getType())->getElementType();
|
|
|
|
// Replace sret attribute with noalias. This reduces register pressure by
|
|
diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h
|
|
index 0705e219f2f..4caa5ad4da0 100644
|
|
--- a/utils/benchmark/src/benchmark_register.h
|
|
+++ b/utils/benchmark/src/benchmark_register.h
|
|
@@ -1,6 +1,7 @@
|
|
#ifndef BENCHMARK_REGISTER_H
|
|
#define BENCHMARK_REGISTER_H
|
|
|
|
+#include <limits>
|
|
#include <vector>
|
|
|
|
#include "check.h"
|