From 29d442f6f3aceba3629a216089c9262d3b047613 Mon Sep 17 00:00:00 2001 From: Koundinya Veluri Date: Thu, 24 Jan 2019 07:30:31 -0800 Subject: 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 --- src/vm/amd64/virtualcallstubcpu.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3