diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-11-30 18:27:27 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-11-30 18:36:32 +0100 |
| commit | 40d5eeac6cd89a2360c3ba997cbaa816abca828c (patch) | |
| tree | cdbf4b94def9e6c3dd45d4b5c945c578187806a2 /llvm/lib/Analysis/TargetLibraryInfo.cpp | |
| parent | a356dae74c8798d5f859d2339466e002a65e4abe (diff) | |
| download | llvm-40d5eeac6cd89a2360c3ba997cbaa816abca828c.zip llvm-40d5eeac6cd89a2360c3ba997cbaa816abca828c.tar.gz llvm-40d5eeac6cd89a2360c3ba997cbaa816abca828c.tar.bz2 | |
Revert "Use VersionTuple for parsing versions in Triple. This makes it possible to distinguish between "16" and "16.0" after parsing, which previously was not possible."
This reverts commit 1e8286467036d8ef1a972de723f805a4981b2692.
llvm/test/Transforms/LoopStrengthReduce/X86/2009-11-10-LSRCrash.ll fails
with assertion failure:
llc: /home/nikic/llvm-project/llvm/include/llvm/ADT/Optional.h:196: T& llvm::optional_detail::OptionalStorage<T, true>::getValue() & [with T = unsigned int]: Assertion `hasVal' failed.
...
#8 0x00005633843af5cb llvm::MCStreamer::emitVersionForTarget(llvm::Triple const&, llvm::VersionTuple const&)
#9 0x0000563383b47f14 llvm::AsmPrinter::doInitialization(llvm::Module&)
Diffstat (limited to 'llvm/lib/Analysis/TargetLibraryInfo.cpp')
| -rw-r--r-- | llvm/lib/Analysis/TargetLibraryInfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp index 603fd4e..616ebc8 100644 --- a/llvm/lib/Analysis/TargetLibraryInfo.cpp +++ b/llvm/lib/Analysis/TargetLibraryInfo.cpp @@ -230,8 +230,9 @@ static void initialize(TargetLibraryInfoImpl &TLI, const Triple &T, // e.g., x86_64-pc-windows-msvc18. bool hasPartialC99 = true; if (T.isKnownWindowsMSVCEnvironment()) { - VersionTuple Version = T.getEnvironmentVersion(); - hasPartialC99 = (Version.getMajor() == 0 || Version.getMajor() >= 19); + unsigned Major, Minor, Micro; + T.getEnvironmentVersion(Major, Minor, Micro); + hasPartialC99 = (Major == 0 || Major >= 19); } // Latest targets support C89 math functions, in part. |