diff options
| author | Koundinya Veluri <kouvel@users.noreply.github.com> | 2019-01-24 07:30:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 07:30:31 -0800 |
| commit | 29d442f6f3aceba3629a216089c9262d3b047613 (patch) | |
| tree | 52fd0a0b3e7338629c8076444dab9836007d3ea1 | |
| parent | 335458f7317cdc7ce1f0e06a48ad270bf2fab7c3 (diff) | |
| download | coreclr-29d442f6f3aceba3629a216089c9262d3b047613.tar.gz coreclr-29d442f6f3aceba3629a216089c9262d3b047613.tar.bz2 coreclr-29d442f6f3aceba3629a216089c9262d3b047613.zip | |
Work around build failure (#22138)
Fixes https://github.com/dotnet/coreclr/issues/22103
- There were reports of build failure from https://github.com/dotnet/coreclr/pull/21292, worked around it for now with a todo
| -rw-r--r-- | src/vm/amd64/virtualcallstubcpu.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vm/amd64/virtualcallstubcpu.hpp b/src/vm/amd64/virtualcallstubcpu.hpp index c163736fac..3c3593f0b9 100644 --- a/src/vm/amd64/virtualcallstubcpu.hpp +++ b/src/vm/amd64/virtualcallstubcpu.hpp @@ -586,7 +586,9 @@ void DispatchHolder::InitializeStatic() static_assert_no_msg(((sizeof(DispatchStub) + sizeof(DispatchStubShort)) % sizeof(void*)) == 0); static_assert_no_msg(((sizeof(DispatchStub) + sizeof(DispatchStubLong)) % sizeof(void*)) == 0); - static_assert_no_msg((DispatchStubLong_offsetof_failLabel - DispatchStubLong_offsetof_failDisplBase) < INT8_MAX); + // TODO: This should be a static_assert_no_msg(), but there were reports of build failure with VS 2019 due to the expression + // not being a compile-time constant, see https://github.com/dotnet/coreclr/issues/22103 + _ASSERTE((DispatchStubLong_offsetof_failLabel - DispatchStubLong_offsetof_failDisplBase) < INT8_MAX); // Common dispatch stub initialization dispatchInit._entryPoint [0] = 0x48; |