diff options
| author | Simon Pilgrim <llvm-dev@redking.me.uk> | 2024-11-21 13:33:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-21 13:33:13 +0000 |
| commit | d800ea7cb12245f65f886e18545ba83355825246 (patch) | |
| tree | 17a5f87f44998ec7b43437fa273ee3c81b078c5a | |
| parent | d23449d99c816b2d5b507f8d44f6e324e658e8bc (diff) | |
| download | llvm-d800ea7cb12245f65f886e18545ba83355825246.zip llvm-d800ea7cb12245f65f886e18545ba83355825246.tar.gz llvm-d800ea7cb12245f65f886e18545ba83355825246.tar.bz2 | |
Adjust MSVC disabled optimization pragmas to be _MSC_VER only (#116704)
Alter the #ifdef values from #110986 and #115292 to use _MSC_VER instead of _WIN32 to stop the pragmas being used on gcc/mingw builds
Noticed by @mstorsjo
| -rw-r--r-- | clang/lib/AST/ByteCode/Interp.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/ByteCode/Interp.cpp b/clang/lib/AST/ByteCode/Interp.cpp index 339af0c..1d2b530 100644 --- a/clang/lib/AST/ByteCode/Interp.cpp +++ b/clang/lib/AST/ByteCode/Interp.cpp @@ -1588,7 +1588,7 @@ bool CheckBitCast(InterpState &S, CodePtr OpPC, bool HasIndeterminateBits, } // https://github.com/llvm/llvm-project/issues/102513 -#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG) +#if defined(_MSC_VER) && !defined(__clang__) && !defined(NDEBUG) #pragma optimize("", off) #endif bool Interpret(InterpState &S, APValue &Result) { @@ -1616,7 +1616,7 @@ bool Interpret(InterpState &S, APValue &Result) { } } // https://github.com/llvm/llvm-project/issues/102513 -#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG) +#if defined(_MSC_VER) && !defined(__clang__) && !defined(NDEBUG) #pragma optimize("", on) #endif diff --git a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp index 10dad76..8512fd9 100644 --- a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp +++ b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp @@ -32,7 +32,7 @@ using namespace llvm; #define PASS_NAME "AArch64 Instruction Selection" // https://github.com/llvm/llvm-project/issues/114425 -#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG) +#if defined(_MSC_VER) && !defined(__clang__) && !defined(NDEBUG) #pragma inline_depth(0) #endif |