Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,14 @@ jobs:

- name: Setup Environment
run: |
brew update-reset
brew link --overwrite openssl@3
brew cleanup
brew doctor
brew reinstall cask
brew update
brew tap shivammathur/php
# because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452
brew update
brew install re2c cmake coreutils openssl libiconv re2 pcre yaml-cpp zstd googletest shivammathur/php/php@7.4
brew link --overwrite --force shivammathur/php/php@7.4
Expand Down
10 changes: 5 additions & 5 deletions common/sanitizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

#pragma once

#include <sanitizer/asan_interface.h>

#if defined(__SANITIZE_ADDRESS__)
# define ASAN_ENABLED 1
# include <sanitizer/asan_interface.h>
#elif defined(__has_feature)
# if __has_feature(address_sanitizer)
# define ASAN_ENABLED 1
# include <sanitizer/asan_interface.h>
# endif
#endif

Expand All @@ -19,11 +19,11 @@
#endif

#if defined(__clang__)
#define ubsan_supp(x) __attribute__((no_sanitize(x)))
# define ubsan_supp(x) __attribute__((no_sanitize(x)))
#else
#define ubsan_supp(x) __attribute__((no_sanitize_undefined))
# define ubsan_supp(x) __attribute__((no_sanitize_undefined))
#endif

#if !defined(USAN_ENABLED)
# define USAN_ENABLED 0
#endif
#endif
2 changes: 1 addition & 1 deletion common/type_traits/is_copyable.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ template<class T>
struct is_trivially_copyable {
#if __GNUG__ && __GNUC__ < 5
// works identically in common cases, but there are subtle differneces: https://stackoverflow.com/questions/12754886/has-trivial-copy-behaves-differently-in-clang-and-gcc-whos-right
static constexpr bool value = __has_trivial_copy(T);
static constexpr bool value = __is_trivially_copyable(T);
#else
static constexpr bool value = std::is_trivially_copyable<T>::value;
#endif
Expand Down