Adjust MSVC disabled optimization pragmas to be _MSC_VER only (#116704)

RKSimon · web-flow · commit d800ea7cb122 · 2024-11-21T13:33:13.000Z
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
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,7 @@ bool CheckBitCast(InterpState &S, CodePtr OpPC, bool HasIndeterminateBits,`
`1588`	`1588`	`}`
`1589`	`1589`
`1590`	`1590`	`// https://github.com/llvm/llvm-project/issues/102513`
`1591`		`-#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG)`
	`1591`	`+#if defined(_MSC_VER) && !defined(__clang__) && !defined(NDEBUG)`
`1592`	`1592`	`#pragma optimize("", off)`
`1593`	`1593`	`#endif`
`1594`	`1594`	`bool Interpret(InterpState &S, APValue &Result) {`
`@@ -1616,7 +1616,7 @@ bool Interpret(InterpState &S, APValue &Result) {`
`1616`	`1616`	`}`
`1617`	`1617`	`}`
`1618`	`1618`	`// https://github.com/llvm/llvm-project/issues/102513`
`1619`		`-#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG)`
	`1619`	`+#if defined(_MSC_VER) && !defined(__clang__) && !defined(NDEBUG)`
`1620`	`1620`	`#pragma optimize("", on)`
`1621`	`1621`	`#endif`
`1622`	`1622`