maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "MSVC Buggy version detection: turn pre-processor error into CMake configuration time check" 

This reverts commit b4fac78246.
It broke the MSVC bot
This commit is contained in:
Mehdi Amini 2020-01-30 23:38:36 +00:00
parent 17dbc6611d
commit 1e417ba2d4
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/cmake/modules/CheckCompilerVersion.cmake
View File

@ -50,20 +50,6 @@ check_compiler_version("Clang" "Clang" ${CLANG_MIN} ${CLANG_SOFT_ERROR})
check_compiler_version("AppleClang" "Apple Clang" ${APPLECLANG_MIN} ${APPLECLANG_SOFT_ERROR})
check_compiler_version("MSVC" "Visual Studio" ${MSVC_MIN} ${MSVC_SOFT_ERROR})
# See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html
# and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly"
# on llvm-dev Jan 21-23 2020.
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND
19.24 VERSION_LESS_EQUAL CMAKE_CXX_COMPILER_VERSION AND
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.25)
if(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN)
message(WARNING "Host Visual Studio version 16.4 is known to miscompile part of LLVM")
else()
message(FATAL_ERROR "Host Visual Studio version 16.4 is known to miscompile part of LLVM, please use clang-cl or upgrade to 16.5 or above (use -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON to ignore)")
endif()
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if (CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
if (CMAKE_CXX_SIMULATE_VERSION VERSION_LESS MSVC_MIN)

7
llvm/include/llvm/Support/Compiler.h
View File

@ -24,6 +24,13 @@
#if defined(_MSC_VER)
#include <sal.h>
#if _MSC_VER == 1924 && !defined(__clang__)
// See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html
// and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly"
// on llvm-dev Jan 21-23 2020.
#error "MSVC 19.24 (Visual Studio 2019 version 16.4) is known to miscompile LLVM. Please upgrade to version 16.5+ or use clang-cl."
#endif
#endif
#ifndef __has_feature