Skip to content

Fixes for VS preview #45902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdmaclea merged 5 commits into from
Dec 11, 2020
Merged

Fixes for VS preview #45902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cbe388
Fixes for VS preview
sdmaclea Dec 10, 2020
e937b10
Only set c++latest on remote-unwind.cpp
sdmaclea Dec 10, 2020
647abb1
Stop using c++latest and designated initializers
sdmaclea Dec 10, 2020
4882df2
PR feedback
sdmaclea Dec 10, 2020
3670c7d
Revert constexpr
sdmaclea Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/coreclr/pal/src/exception/remote-unwind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,18 +1975,24 @@ put_unwind_info(unw_addr_space_t as, unw_proc_info_t *pip, void *arg)
{
}

static unw_accessors_t unwind_accessors =
static unw_accessors_t init_unwind_accessors()
{
.find_proc_info = find_proc_info,
.put_unwind_info = put_unwind_info,
.get_dyn_info_list_addr = get_dyn_info_list_addr,
.access_mem = access_mem,
.access_reg = access_reg,
.access_fpreg = access_fpreg,
.resume = resume,
.get_proc_name = get_proc_name
unw_accessors_t a = {0};

a.find_proc_info = find_proc_info;
a.put_unwind_info = put_unwind_info;
a.get_dyn_info_list_addr = get_dyn_info_list_addr;
a.access_mem = access_mem;
a.access_reg = access_reg;
a.access_fpreg = access_fpreg;
a.resume = resume;
a.get_proc_name = get_proc_name;

return a;
};

static unw_accessors_t unwind_accessors = init_unwind_accessors();

/*++
Function:
PAL_VirtualUnwindOutOfProc
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/pal/src/libunwind/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ if(CLR_CMAKE_HOST_WIN32)
endif ()

# Assume we are using default MSVC compiler
add_compile_options(/std:c++latest)
add_compile_options(/TC) # compile all files as C
add_compile_options(/permissive-)

Expand All @@ -148,6 +147,8 @@ if(CLR_CMAKE_HOST_WIN32)
add_compile_options(-wd4311) # pointer truncation from 'unw_word_t *' to 'long'
add_compile_options(-wd4475) # 'fprintf' : length modifier 'L' cannot be used
add_compile_options(-wd4477) # fprintf argument type

add_compile_options(-wd9025) # overriding '/TP' with '/TC'
endif (CLR_CMAKE_HOST_WIN32)

if(CLR_CMAKE_TARGET_ARCH_ARM)
Expand Down