Skip to content

Commit 285f392

Browse files
authored
Merge branch 'main' into feature/run-tests-on-arm-runners
2 parents 05cc84e + 060f987 commit 285f392

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.devcontainer/rust/devcontainer-metadata-vscode.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"extensions": [
88
"mhutchie.git-graph@1.30.0",
99
"ms-vsliveshare.vsliveshare@1.0.5948",
10-
"rust-lang.rust-analyzer@0.3.2466",
10+
"rust-lang.rust-analyzer@0.3.2474",
1111
"tamasfe.even-better-toml@0.21.2",
1212
"usernamehw.errorlens@3.26.0"
1313
]

test/cpp/workspace/clang-cl/toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ find_program(CMAKE_CXX_COMPILER NAMES clang-cl REQUIRED)
1919
find_program(CMAKE_AR NAMES llvm-lib REQUIRED)
2020

2121
add_compile_options(--target=x86_64-pc-windows-msvc -fuse-ld=lld /winsdkdir ${WINDOWS_SDK_ROOT}/sdk /vctoolsdir ${WINDOWS_SDK_ROOT}/crt)
22-
add_link_options(/manifest:no -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/um/x64 -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/ucrt/x64 -libpath:${WINDOWS_SDK_ROOT}/crt/lib/x64)
22+
add_link_options(/machine:x64 /manifest:no -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/um/x64 -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/ucrt/x64 -libpath:${WINDOWS_SDK_ROOT}/crt/lib/x64)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#include <cstdint>
2+
#include <cstdlib>
23

34
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, std::size_t size)
45
{
56
if (size > 0 && data[0] == 'H')
67
if (size > 1 && data[1] == 'I')
7-
__builtin_trap();
8+
abort();
89

910
return 0;
1011
}

0 commit comments

Comments
 (0)