Skip to content
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

Fix sanitizer on win #1132

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Fix sanitizer on win #1132

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b763c54
lets try this
DmitriyMusatkin Jul 1, 2024
774282e
rerun
DmitriyMusatkin Jul 1, 2024
eb97c25
or this
DmitriyMusatkin Jul 1, 2024
7bc1fdd
enable asan
DmitriyMusatkin Jul 1, 2024
12abac5
use latest
DmitriyMusatkin Jul 1, 2024
285892d
fix win flags
DmitriyMusatkin Jul 1, 2024
fffd247
cmake
DmitriyMusatkin Jul 1, 2024
2dade85
14
DmitriyMusatkin Jul 1, 2024
3551df4
explicit ver
DmitriyMusatkin Jul 1, 2024
4c2330b
add libs
DmitriyMusatkin Jul 1, 2024
c25d157
no link
DmitriyMusatkin Jul 1, 2024
0207e30
typo
DmitriyMusatkin Jul 1, 2024
73e3f0b
link libs
DmitriyMusatkin Jul 1, 2024
1c72972
target
DmitriyMusatkin Jul 1, 2024
81498f9
check that asan worked
DmitriyMusatkin Jul 2, 2024
910da38
lets init it first
DmitriyMusatkin Jul 2, 2024
edd3db3
do we need this
DmitriyMusatkin Jul 2, 2024
07d86e8
clean up
DmitriyMusatkin Jul 2, 2024
cc7de53
remove regular win
DmitriyMusatkin Jul 2, 2024
1da92bc
unbreak the test
DmitriyMusatkin Jul 2, 2024
eb7064b
revert test changes
DmitriyMusatkin Jul 2, 2024
24ca6a6
make it private
DmitriyMusatkin Jul 2, 2024
8e2c628
remove linker flag
DmitriyMusatkin Jul 3, 2024
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
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,18 @@ jobs:
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF

windows:
windows-sanitizer:
runs-on: windows-2022 # latest
steps:
- name: Setup MSVC dev env (san, etc...)
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
# note: default sanitizer pair is address,undefined. win currently only supports address.
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }}
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DENABLE_SANITIZERS=ON

windows-vc16:
runs-on: windows-2022 # latest
Expand Down
14 changes: 12 additions & 2 deletions cmake/AwsSanitizers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,18 @@ function(aws_add_sanitizers target)
endforeach()

if(PRESENT_SANITIZERS)
target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS})
target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}")
if(MSVC)
if(AWS_ARCH_INTEL_X64)
target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS})
target_link_libraries(${target} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64)
else()
message("On Win platforms sanitizer is only supported on x86-64")
return()
endif()
else()
target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS})
target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this one PUBLIC but the rest are PRIVATE?

endif()

string(REPLACE "," ";" PRESENT_SANITIZERS "${PRESENT_SANITIZERS}")
set(${target}_SANITIZERS ${PRESENT_SANITIZERS} PARENT_SCOPE)
Expand Down
Loading