From 526480da15f281ce82f8986d8433b8f1547f5333 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Mon, 3 Jul 2023 20:05:46 +0300 Subject: [PATCH 01/18] init --- common/sanitizer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/sanitizer.h b/common/sanitizer.h index 3795754372..983712b4e3 100644 --- a/common/sanitizer.h +++ b/common/sanitizer.h @@ -4,13 +4,13 @@ #pragma once -#include - #if defined(__SANITIZE_ADDRESS__) # define ASAN_ENABLED 1 +# include #elif defined(__has_feature) # if __has_feature(address_sanitizer) # define ASAN_ENABLED 1 +# include # endif #endif From dfc20510a0e977d68ca4824114f669cab3a46de0 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 12:43:11 +0300 Subject: [PATCH 02/18] refactor --- common/sanitizer.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/common/sanitizer.h b/common/sanitizer.h index 983712b4e3..b7da52cdeb 100644 --- a/common/sanitizer.h +++ b/common/sanitizer.h @@ -4,24 +4,17 @@ #pragma once -#if defined(__SANITIZE_ADDRESS__) +#if defined(__SANITIZE_ADDRESS__) || defined(__has_feature) # define ASAN_ENABLED 1 # include -#elif defined(__has_feature) -# if __has_feature(address_sanitizer) -# define ASAN_ENABLED 1 -# include -# endif -#endif - -#if !defined(ASAN_ENABLED) +#else # define ASAN_ENABLED 0 #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) From 0accc15e28ab3063571948c7cd862125ddb79ca3 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 12:54:39 +0300 Subject: [PATCH 03/18] back --- common/sanitizer.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/common/sanitizer.h b/common/sanitizer.h index b7da52cdeb..ab52828984 100644 --- a/common/sanitizer.h +++ b/common/sanitizer.h @@ -4,10 +4,17 @@ #pragma once -#if defined(__SANITIZE_ADDRESS__) || defined(__has_feature) +#if defined(__SANITIZE_ADDRESS__) # define ASAN_ENABLED 1 # include -#else +#elif defined(__has_feature) +# if __has_feature(address_sanitizer) +# define ASAN_ENABLED 1 +# include +# endif +#endif + +#if !defined(ASAN_ENABLED) # define ASAN_ENABLED 0 #endif @@ -19,4 +26,4 @@ #if !defined(USAN_ENABLED) # define USAN_ENABLED 0 -#endif +#endif \ No newline at end of file From 615f8586e1e1fbbd4c1088ec8a503a5ebe932f2e Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 15:05:32 +0300 Subject: [PATCH 04/18] no com --- common/sanitizer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/sanitizer.h b/common/sanitizer.h index ab52828984..25ec874ea4 100644 --- a/common/sanitizer.h +++ b/common/sanitizer.h @@ -10,7 +10,7 @@ #elif defined(__has_feature) # if __has_feature(address_sanitizer) # define ASAN_ENABLED 1 -# include +# include # endif #endif From c3085dcfa7daee810e1e27fce1f4de74105372e0 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:05:38 +0300 Subject: [PATCH 05/18] try fix mac os --- .github/workflows/Build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index e3421c1d25..7cf5f649d4 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -116,8 +116,13 @@ jobs: ref: stable-3.x - name: Setup Environment - run: | + run: | + brew reinstall cask + brew cask doctor + brew doctor + brew update-reset 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 From 56b2aceee3ba9f0b518637009d615f5c1c06a6a4 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:06:25 +0300 Subject: [PATCH 06/18] try fix mac os --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 7cf5f649d4..d035adb559 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -116,7 +116,7 @@ jobs: ref: stable-3.x - name: Setup Environment - run: | + run: | brew reinstall cask brew cask doctor brew doctor From 0df30cb680773aec1f5e995001e1a7299e483eb3 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:09:01 +0300 Subject: [PATCH 07/18] try fix mac os homebrew --- .github/workflows/Build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d035adb559..803e831c12 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -117,9 +117,6 @@ jobs: - name: Setup Environment run: | - brew reinstall cask - brew cask doctor - brew doctor brew update-reset brew tap shivammathur/php # because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452 From e76a336d339ab154192a2ae9fcf78c85be7e7fb4 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:30:10 +0300 Subject: [PATCH 08/18] fix mac os build with clang16 --- common/type_traits/is_copyable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/type_traits/is_copyable.h b/common/type_traits/is_copyable.h index d367a3b1a9..e606834e97 100644 --- a/common/type_traits/is_copyable.h +++ b/common/type_traits/is_copyable.h @@ -12,7 +12,7 @@ template 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::value; #endif From 985a43f5fe552c844e6a938f1e4f1e12e90f5b59 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:45:08 +0300 Subject: [PATCH 09/18] try fix mac os --- .github/workflows/Build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 803e831c12..5600103f46 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -118,6 +118,8 @@ jobs: - name: Setup Environment run: | brew update-reset + brew doctor + brew reinstall cask brew tap shivammathur/php # because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452 brew update From 024e2ffa1ee384a0b55f0a412941433f4a87fe31 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 16:59:13 +0300 Subject: [PATCH 10/18] try fix mac os homebrew --- .github/workflows/Build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 5600103f46..0fe86927d1 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -120,6 +120,8 @@ jobs: brew update-reset brew doctor brew reinstall cask + brew cleanup + brew link openssl@3 brew tap shivammathur/php # because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452 brew update From 79e436001b13a27a7bf2990f646421e16749d52e Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:01:47 +0300 Subject: [PATCH 11/18] try fix mac os homebrew --- .github/workflows/Build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 0fe86927d1..b5b25730cf 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -118,10 +118,10 @@ jobs: - name: Setup Environment run: | brew update-reset - brew doctor - brew reinstall cask brew cleanup brew link openssl@3 + brew doctor + brew reinstall cask brew tap shivammathur/php # because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452 brew update From 0e5b74eb478c6866b174a6edad3e2a0699b0678e Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:04:30 +0300 Subject: [PATCH 12/18] try fix mac os homebrew --- .github/workflows/Build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index b5b25730cf..fd03d22309 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -119,7 +119,6 @@ jobs: run: | brew update-reset brew cleanup - brew link openssl@3 brew doctor brew reinstall cask brew tap shivammathur/php From 34eb8e3e52978bb063ea8555d58a315044c0d03b Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:10:14 +0300 Subject: [PATCH 13/18] try fix mac os homebrew --- .github/workflows/Build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index fd03d22309..3aba11cee4 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -119,6 +119,7 @@ jobs: run: | brew update-reset brew cleanup + brew link --force openssl@3 brew doctor brew reinstall cask brew tap shivammathur/php From 98a4f5c1036655f998045e7ad6a6aa8b9f20f0ae Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:12:14 +0300 Subject: [PATCH 14/18] try fix mac os homebrew --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 3aba11cee4..1c9aad0129 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -119,7 +119,7 @@ jobs: run: | brew update-reset brew cleanup - brew link --force openssl@3 + brew link ---overwrite openssl@3 brew doctor brew reinstall cask brew tap shivammathur/php From 3260af5f5932a0a15b3bc29ffebd1bfcf8f99159 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:16:02 +0300 Subject: [PATCH 15/18] try fix mac os homebrew --- .github/workflows/Build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 1c9aad0129..d0df4d490d 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -119,7 +119,8 @@ jobs: run: | brew update-reset brew cleanup - brew link ---overwrite openssl@3 + brew unlink openssl@1.1 + brew link openssl@3 brew doctor brew reinstall cask brew tap shivammathur/php From c085a26828eb298025d0d9d3df724695c6c64d71 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:20:36 +0300 Subject: [PATCH 16/18] try fix mac os homebrew --- .github/workflows/Build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d0df4d490d..5600103f46 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -118,9 +118,6 @@ jobs: - name: Setup Environment run: | brew update-reset - brew cleanup - brew unlink openssl@1.1 - brew link openssl@3 brew doctor brew reinstall cask brew tap shivammathur/php From 0337c32cdcd05ba676910ef0820178b567b1efcd Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:24:34 +0300 Subject: [PATCH 17/18] try fix mac os homebrew --- .github/workflows/Build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 5600103f46..47a1c01cb1 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -118,6 +118,8 @@ jobs: - name: Setup Environment run: | brew update-reset + brew link --overwrite openssl@3 + brew cleanup brew doctor brew reinstall cask brew tap shivammathur/php From d285f6539ee6cdfa7fd77a0b10745ef91d6094a3 Mon Sep 17 00:00:00 2001 From: Andrey Arutiunian Date: Tue, 4 Jul 2023 17:33:52 +0300 Subject: [PATCH 18/18] try fix mac os homebrew --- .github/workflows/Build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 47a1c01cb1..fab4e3bf5d 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -122,6 +122,7 @@ jobs: 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