Skip to content

Commit

Permalink
Work around build failure (dotnet/coreclr#22138)
Browse files Browse the repository at this point in the history
Fixes https://github.com/dotnet/coreclr/issues/22103
- There were reports of build failure from dotnet/coreclr#21292, worked around it for now with a todo

Commit migrated from dotnet/coreclr@29d442f
  • Loading branch information
kouvel committed Jan 24, 2019
1 parent b04b2eb commit 55a78c7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/coreclr/src/vm/amd64/virtualcallstubcpu.hpp
Expand Up @@ -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;
Expand Down

0 comments on commit 55a78c7

Please sign in to comment.