Browse Source

intermediate changes
ref:6e865ff0ae14a24901c8add989f674d8e88acf17

arcadia-devtools 2 years ago
parent
commit
24f5751a62

+ 4 - 2
build/rules/go/extended_lint.yaml

@@ -2,6 +2,10 @@
 scopes:
   a.yandex-team.ru/cloud/mdb:
     - importcheck
+  a.yandex-team.ru/library/go:
+    - importcheck
+  a.yandex-team.ru/market/combinator:
+    - importcheck
   a.yandex-team.ru/passport:
     - importcheck
   a.yandex-team.ru/portal/avocado:
@@ -12,5 +16,3 @@ scopes:
     - importcheck
   a.yandex-team.ru/strm:
     - importcheck
-  a.yandex-team.ru/market/combinator:
-    - importcheck

+ 2 - 2
build/ya.conf.json

@@ -7832,7 +7832,7 @@
         },
         "news": {
             "formula": {
-                "sandbox_id": 1240664469,
+                "sandbox_id": 1260940182,
                 "match": "news_launcher"
             },
             "executable": {
@@ -8559,7 +8559,7 @@
         },
         "lama": {
             "formula": {
-                "sandbox_id": 1256094494,
+                "sandbox_id": 1260998424,
                 "match": "lama"
             },
             "executable": {

+ 1 - 1
build/ymake.core.conf

@@ -9,7 +9,7 @@
 FAKEID=3141592653
 
 SANDBOX_FAKEID=${FAKEID}.7600000
-CPP_FAKEID=9268319
+CPP_FAKEID=9278195
 GO_FAKEID=9056219
 ANDROID_FAKEID=8821472
 CLANG_TIDY_FAKEID=8625699

+ 1 - 1
contrib/libs/cxxsupp/libcxx/import

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-rev=7056250f
+rev=ee8e81b4
 output_dir="libcxx-r$rev"
 if [ -z $1 ] ; then
     git clone https://github.com/llvm/llvm-project.git --no-checkout "$output_dir/tmp"

+ 1 - 1
contrib/libs/cxxsupp/libcxx/include/__algorithm/make_heap.h

@@ -32,7 +32,7 @@ __make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compar
         // start from the first parent, there is no need to consider children
         for (difference_type __start = (__n - 2) / 2; __start >= 0; --__start)
         {
-            _VSTD::__sift_down<_Compare>(__first, __last, __comp, __n, __first + __start);
+            _VSTD::__sift_down<_Compare>(__first, __comp, __n, __first + __start);
         }
     }
 }

+ 1 - 1
contrib/libs/cxxsupp/libcxx/include/__algorithm/partial_sort.h

@@ -40,7 +40,7 @@ __partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _R
         if (__comp(*__i, *__first))
         {
             swap(*__i, *__first);
-            _VSTD::__sift_down<_Compare>(__first, __middle, __comp, __len, __first);
+            _VSTD::__sift_down<_Compare>(__first, __comp, __len, __first);
         }
     }
     _VSTD::__sort_heap<_Compare>(__first, __middle, __comp);

+ 1 - 1
contrib/libs/cxxsupp/libcxx/include/__algorithm/partial_sort_copy.h

@@ -40,7 +40,7 @@ __partial_sort_copy(_InputIterator __first, _InputIterator __last,
             if (__comp(*__first, *__result_first))
             {
                 *__result_first = *__first;
-                _VSTD::__sift_down<_Compare>(__result_first, __r, __comp, __len, __result_first);
+                _VSTD::__sift_down<_Compare>(__result_first, __comp, __len, __result_first);
             }
         _VSTD::__sort_heap<_Compare>(__result_first, __r, __comp);
     }

+ 1 - 1
contrib/libs/cxxsupp/libcxx/include/__algorithm/pop_heap.h

@@ -31,7 +31,7 @@ __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare
     if (__len > 1)
     {
         swap(*__first, *--__last);
-        _VSTD::__sift_down<_Compare>(__first, __last, __comp, __len - 1, __first);
+        _VSTD::__sift_down<_Compare>(__first, __comp, __len - 1, __first);
     }
 }
 

+ 2 - 3
contrib/libs/cxxsupp/libcxx/include/__algorithm/sift_down.h

@@ -21,8 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Compare, class _RandomAccessIterator>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 void
-__sift_down(_RandomAccessIterator __first, _RandomAccessIterator /*__last*/,
-            _Compare __comp,
+__sift_down(_RandomAccessIterator __first, _Compare __comp,
             typename iterator_traits<_RandomAccessIterator>::difference_type __len,
             _RandomAccessIterator __start)
 {
@@ -46,7 +45,7 @@ __sift_down(_RandomAccessIterator __first, _RandomAccessIterator /*__last*/,
 
     // check if we are in heap-order
     if (__comp(*__child_i, *__start))
-        // we are, __start is larger than it's largest child
+        // we are, __start is larger than its largest child
         return;
 
     value_type __top(_VSTD::move(*__start));

+ 28 - 2
contrib/libs/cxxsupp/libcxx/include/__coroutine/noop_coroutine_handle.h

@@ -20,7 +20,8 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if __has_builtin(__builtin_coro_noop)
+#if __has_builtin(__builtin_coro_noop) || defined(_LIBCPP_COMPILER_GCC)
+
 // [coroutine.noop]
 // [coroutine.promise.noop]
 struct noop_coroutine_promise {};
@@ -64,20 +65,45 @@ private:
     _LIBCPP_HIDE_FROM_ABI
     friend coroutine_handle<noop_coroutine_promise> noop_coroutine() noexcept;
 
+#if __has_builtin(__builtin_coro_noop)
     _LIBCPP_HIDE_FROM_ABI coroutine_handle() noexcept {
         this->__handle_ = __builtin_coro_noop();
     }
 
     void* __handle_ = nullptr;
+
+#elif defined(_LIBCPP_COMPILER_GCC)
+    // GCC doesn't implement __builtin_coro_noop().
+    // Construct the coroutine frame manually instead.
+    struct __noop_coroutine_frame_ty_ {
+        static void __dummy_resume_destroy_func() { }
+
+        void (*__resume_)() = __dummy_resume_destroy_func;
+        void (*__destroy_)() = __dummy_resume_destroy_func;
+        struct noop_coroutine_promise __promise_;
+    };
+
+    static __noop_coroutine_frame_ty_ __noop_coroutine_frame_;
+
+    void* __handle_ = &__noop_coroutine_frame_;
+
+    _LIBCPP_HIDE_FROM_ABI coroutine_handle() noexcept = default;
+
+#endif // __has_builtin(__builtin_coro_noop)
 };
 
 using noop_coroutine_handle = coroutine_handle<noop_coroutine_promise>;
 
+#if defined(_LIBCPP_COMPILER_GCC)
+inline noop_coroutine_handle::__noop_coroutine_frame_ty_
+    noop_coroutine_handle::__noop_coroutine_frame_{};
+#endif
+
 // [coroutine.noop.coroutine]
 inline _LIBCPP_HIDE_FROM_ABI
 noop_coroutine_handle noop_coroutine() noexcept { return noop_coroutine_handle(); }
 
-#endif // __has_builtin(__builtin_coro_noop)
+#endif // __has_builtin(__builtin_coro_noop) || defined(_LIBCPP_COMPILER_GCC)
 
 _LIBCPP_END_NAMESPACE_STD
 

Some files were not shown because too many files changed in this diff