This is an archive of the discontinued LLVM Phabricator instance.

Differential D65662

Remove support for unsupported MSVC versions
ClosedPublic

Authored by jfb on Aug 2 2019, 9:23 AM.

Details

Reviewers
rnk
lebedev.ri
aaron.ballman
Commits
rG748dac7389bd: Remove support for unsupported MSVC versions
rL367734: Remove support for unsupported MSVC versions
rGdc8af80c190e: Remove support for unsupported MSVC versions
rL367727: Remove support for unsupported MSVC versions

Diff Detail

Event Timeline

jfb created this revision.Aug 2 2019, 9:23 AM
Herald added a reviewer: lebedev.ri. · View Herald TranscriptAug 2 2019, 9:23 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, lebedev.ri, dexonsmith and 2 others. · View Herald Transcript
jfb marked an inline comment as done.Aug 2 2019, 9:24 AM
jfb added inline comments.
llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
77

This seemed buggy, I think the intent was to get msdia140 if it was available.

Harbormaster completed remote builds in B36036: Diff 213062.Aug 2 2019, 9:25 AM
aaron.ballman accepted this revision.Aug 2 2019, 9:33 AM
aaron.ballman added a subscriber: aaron.ballman.

LGTM!

This revision is now accepted and ready to land.Aug 2 2019, 9:33 AM
lebedev.ri added a comment.Aug 2 2019, 9:46 AM

I don't think you need that benchmark change, it will just pop right back in the next time it's updated.

jfb updated this revision to Diff 213068.Aug 2 2019, 9:49 AM
  • Undo benchmark change
Harbormaster completed remote builds in B36040: Diff 213068.Aug 2 2019, 9:49 AM
jfb added a comment.Aug 2 2019, 9:49 AM
In D65662#1612503, @lebedev.ri wrote:

I don't think you need that benchmark change, it will just pop right back in the next time it's updated.

True, I undid that change.

lebedev.ri added a comment.Aug 2 2019, 9:51 AM
In D65662#1612513, @jfb wrote:
In D65662#1612503, @lebedev.ri wrote:

I don't think you need that benchmark change, it will just pop right back in the next time it's updated.

True, I undid that change.

No further comments from me, thanks.

rnk accepted this revision.Aug 2 2019, 2:44 PM

lgtm

llvm/lib/Support/Windows/explicit_symbols.inc
94

I confirmed that these are not inline anymore.

Closed by commit rL367727: Remove support for unsupported MSVC versions (authored by jfb). · Explain WhyAug 2 2019, 2:52 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: kristina. · View Herald TranscriptAug 2 2019, 2:52 PM

Revision Contents

PathSize
llvm/
include/
llvm/
Demangle/
7 lines
lib/
DebugInfo/
PDB/
DIA/
8 lines
Support/
Windows/
6 lines
utils/
benchmark/
include/
benchmark/
5 lines

Diff 213062

llvm/include/llvm/Demangle/DemangleConfig.h

Show All 9 Lines
// include/llvm/Support/Compiler.h so that LLVMDemangle does not need to take // include/llvm/Support/Compiler.h so that LLVMDemangle does not need to take
// a dependency on LLVMSupport. // a dependency on LLVMSupport.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLVM_DEMANGLE_COMPILER_H #ifndef LLVM_DEMANGLE_COMPILER_H
#define LLVM_DEMANGLE_COMPILER_H #define LLVM_DEMANGLE_COMPILER_H
#ifdef _MSC_VER
// snprintf is implemented in VS 2015
#if _MSC_VER < 1900
#define snprintf _snprintf_s
#endif
#endif
#ifndef __has_feature #ifndef __has_feature
#define __has_feature(x) 0 #define __has_feature(x) 0
#endif #endif
#ifndef __has_cpp_attribute #ifndef __has_cpp_attribute
#define __has_cpp_attribute(x) 0 #define __has_cpp_attribute(x) 0
#endif #endif
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines

llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp

Show First 20 Lines • Show All 67 Lines • ▼ Show 20 Lines if (SUCCEEDED(CoCreateInstance(CLSID_DiaSource, nullptr, CLSCTX_INPROC_SERVER,
reinterpret_cast<LPVOID *>(&DiaDataSource)))) reinterpret_cast<LPVOID *>(&DiaDataSource))))
return Error::success(); return Error::success();
// If the CoCreateInstance call above failed, msdia*.dll is not registered. // If the CoCreateInstance call above failed, msdia*.dll is not registered.
// Try loading the DLL corresponding to the #included DIA SDK. // Try loading the DLL corresponding to the #included DIA SDK.
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
return llvm::make_error<PDBError>(pdb_error_code::dia_failed_loading); return llvm::make_error<PDBError>(pdb_error_code::dia_failed_loading);
#else #else
const wchar_t *msdia_dll = nullptr; const wchar_t *msdia_dll = L"msdia140.dll";
#if _MSC_VER >= 1900 && _MSC_VER < 2000
jfbAuthorUnsubmitted
Done
ReplyInline Actions

This seemed buggy, I think the intent was to get msdia140 if it was available.

jfb: This seemed buggy, I think the intent was to get `msdia140` if it was available.
msdia_dll = L"msdia140.dll"; // VS2015
#elif _MSC_VER >= 1800
msdia_dll = L"msdia120.dll"; // VS2013
#else
#error "Unknown Visual Studio version."
#endif #endif
HRESULT HR; HRESULT HR;
if (FAILED(HR = NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource, if (FAILED(HR = NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource,
reinterpret_cast<LPVOID *>(&DiaDataSource)))) reinterpret_cast<LPVOID *>(&DiaDataSource))))
return ErrorFromHResult(HR, "Calling NoRegCoCreate"); return ErrorFromHResult(HR, "Calling NoRegCoCreate");
return Error::success(); return Error::success();
#endif #endif
▲ Show 20 Lines • Show All 341 Lines • Show Last 20 Lines

llvm/lib/Support/Windows/explicit_symbols.inc

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines#define INLINE_DEF_FLOAT_SYMBOL(SYM, ARGC) INLINE_DEF_SYMBOL##ARGC(float, SYM)
INLINE_DEF_FLOAT_SYMBOL(logf, 1) INLINE_DEF_FLOAT_SYMBOL(logf, 1)
INLINE_DEF_FLOAT_SYMBOL(powf, 2) INLINE_DEF_FLOAT_SYMBOL(powf, 2)
INLINE_DEF_FLOAT_SYMBOL(sinf, 1) INLINE_DEF_FLOAT_SYMBOL(sinf, 1)
INLINE_DEF_FLOAT_SYMBOL(sinhf, 1) INLINE_DEF_FLOAT_SYMBOL(sinhf, 1)
INLINE_DEF_FLOAT_SYMBOL(sqrtf, 1) INLINE_DEF_FLOAT_SYMBOL(sqrtf, 1)
INLINE_DEF_FLOAT_SYMBOL(tanf, 1) INLINE_DEF_FLOAT_SYMBOL(tanf, 1)
INLINE_DEF_FLOAT_SYMBOL(tanhf, 1) INLINE_DEF_FLOAT_SYMBOL(tanhf, 1)
// These were added in VS 2013.
#if (1800 <= _MSC_VER && _MSC_VER < 1900)
rnkUnsubmitted
Not Done
ReplyInline Actions

I confirmed that these are not inline anymore.

rnk: I confirmed that these are not inline anymore.
INLINE_DEF_FLOAT_SYMBOL(copysignf, 2)
INLINE_DEF_FLOAT_SYMBOL(fminf, 2)
INLINE_DEF_FLOAT_SYMBOL(fmaxf, 2)
#endif
#undef INLINE_DEF_FLOAT_SYMBOL #undef INLINE_DEF_FLOAT_SYMBOL
#endif #endif
#endif #endif

llvm/utils/benchmark/include/benchmark/benchmark.h

Show First 20 Lines • Show All 203 Lines • ▼ Show 20 Lines
#if defined(__GNUC__) #if defined(__GNUC__)
#define BENCHMARK_UNUSED __attribute__((unused)) #define BENCHMARK_UNUSED __attribute__((unused))
#define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline)) #define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
#define BENCHMARK_NOEXCEPT noexcept #define BENCHMARK_NOEXCEPT noexcept
#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x) #define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
#elif defined(_MSC_VER) && !defined(__clang__) #elif defined(_MSC_VER) && !defined(__clang__)
#define BENCHMARK_UNUSED #define BENCHMARK_UNUSED
#define BENCHMARK_ALWAYS_INLINE __forceinline #define BENCHMARK_ALWAYS_INLINE __forceinline
#if _MSC_VER >= 1900
#define BENCHMARK_NOEXCEPT noexcept #define BENCHMARK_NOEXCEPT noexcept
#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x) #define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
#else
#define BENCHMARK_NOEXCEPT
#define BENCHMARK_NOEXCEPT_OP(x)
#endif
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__
#else #else
#define BENCHMARK_UNUSED #define BENCHMARK_UNUSED
#define BENCHMARK_ALWAYS_INLINE #define BENCHMARK_ALWAYS_INLINE
#define BENCHMARK_NOEXCEPT #define BENCHMARK_NOEXCEPT
#define BENCHMARK_NOEXCEPT_OP(x) #define BENCHMARK_NOEXCEPT_OP(x)
#endif #endif
▲ Show 20 Lines • Show All 1,242 Lines • Show Last 20 Lines