Skip to content

Commit a2d05b2

Browse files
committed
Merge branch 'master' of github.com:lemire/simdjson
2 parents f4f5f67 + 165e237 commit a2d05b2

File tree

7 files changed

+472
-963
lines changed

7 files changed

+472
-963
lines changed

.github/workflows/fuzzers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
done
6565
- name: Run the other fuzzer variants for $fuzzer, with sanitizers etc
6666
run: |
67-
for fuzzer in $allfuzzers; do
67+
set -x
68+
for fuzzer in $allfuzzers; do
6869
build-ossfuzz-withavx/fuzz/fuzz_$fuzzer out/$fuzzer -max_total_time=20 $artifactsprefix || touch failed
6970
build-ossfuzz-noavx/fuzz/fuzz_$fuzzer out/$fuzzer -max_total_time=10 $artifactsprefix || touch failed
7071
build-ossfuzz-noavx8/fuzz/fuzz_$fuzzer out/$fuzzer -max_total_time=10 $artifactsprefix || touch failed

include/simdjson/stage2_build_tape.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ WARN_UNUSED int
1414
unified_machine(const uint8_t *buf, size_t len, ParsedJson &pj);
1515

1616
template <Architecture T = Architecture::NATIVE>
17-
int unified_machine(const char *buf, size_t len, ParsedJson &pj) {
17+
WARN_UNUSED int
18+
unified_machine(const char *buf, size_t len, ParsedJson &pj) {
1819
return unified_machine<T>(reinterpret_cast<const uint8_t *>(buf), len, pj);
1920
}
2021

src/arm64/stage2_build_tape.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ namespace simdjson {
2121
template <>
2222
WARN_UNUSED int
2323
unified_machine<Architecture::ARM64>(const uint8_t *buf, size_t len, ParsedJson &pj) {
24-
return arm64::unified_machine(buf, len, pj);
24+
return arm64::stage2::unified_machine(buf, len, pj);
2525
}
2626

2727
template <>
2828
WARN_UNUSED int
2929
unified_machine<Architecture::ARM64>(const uint8_t *buf, size_t len, ParsedJson &pj, size_t &next_json) {
30-
return arm64::unified_machine(buf, len, pj, next_json);
30+
return arm64::stage2::unified_machine(buf, len, pj, next_json);
3131
}
3232

3333
} // namespace simdjson

0 commit comments

Comments
 (0)