This commit is contained in:
tudorms 2021-03-19 10:38:54 -07:00 коммит произвёл GitHub
Родитель 547242bf04
Коммит 19aa1f4b67
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 4 добавлений и 42 удалений

Просмотреть файл

@ -1,4 +1,4 @@
{ {
"version": "0.64.9", "version": "0.64.10",
"v8ref": "refs/branch-heads/8.9" "v8ref": "refs/branch-heads/9.0"
} }

Просмотреть файл

@ -154,46 +154,6 @@ index 9a5f7069e7..a53c0ad644 100644
// Windows ARM64 starts since 1709 Windows build, no need to have exception // Windows ARM64 starts since 1709 Windows build, no need to have exception
// handling only unwind info for compatibility. // handling only unwind info for compatibility.
if (unhandled_exception_callback_g) { if (unhandled_exception_callback_g) {
diff --git a/src/heap/heap.h b/src/heap/heap.h
index 24b92e8bc8..a636c5d8c4 100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -2649,10 +2649,7 @@ class StrongRootBlockAllocator {
using size_type = size_t;
using difference_type = ptrdiff_t;
template <class U>
- struct rebind {
- STATIC_ASSERT((std::is_same<Address, U>::value));
- using other = StrongRootBlockAllocator;
- };
+ struct rebind;
explicit StrongRootBlockAllocator(Heap* heap) : heap_(heap) {}
@@ -2663,6 +2660,23 @@ class StrongRootBlockAllocator {
Heap* heap_;
};
+// Rebinding to Address gives another StrongRootBlockAllocator.
+template <>
+struct StrongRootBlockAllocator::rebind<Address> {
+ using other = StrongRootBlockAllocator;
+};
+
+// Rebinding to something other than Address gives a std::allocator that
+// is copy-constructable from StrongRootBlockAllocator.
+template <class U>
+struct StrongRootBlockAllocator::rebind {
+ class other : public std::allocator<U> {
+ public:
+ // NOLINTNEXTLINE
+ other(const StrongRootBlockAllocator&) {}
+ };
+};
+
} // namespace internal
} // namespace v8
diff --git a/src/snapshot/embedded/platform-embedded-file-writer-base.cc b/src/snapshot/embedded/platform-embedded-file-writer-base.cc diff --git a/src/snapshot/embedded/platform-embedded-file-writer-base.cc b/src/snapshot/embedded/platform-embedded-file-writer-base.cc
index cf380b015d..e5461ea89e 100644 index cf380b015d..e5461ea89e 100644
--- a/src/snapshot/embedded/platform-embedded-file-writer-base.cc --- a/src/snapshot/embedded/platform-embedded-file-writer-base.cc

Просмотреть файл

@ -16,7 +16,9 @@ TRACELOGGING_DEFINE_PROVIDER(g_hV8JSIInspectorTraceLoggingProvider,
void globalInitializeTracing() { void globalInitializeTracing() {
#ifdef _WIN32 #ifdef _WIN32
TraceLoggingUnregister(g_hV8JSIRuntimeTraceLoggingProvider);
TraceLoggingRegister(g_hV8JSIRuntimeTraceLoggingProvider); TraceLoggingRegister(g_hV8JSIRuntimeTraceLoggingProvider);
TraceLoggingUnregister(g_hV8JSIInspectorTraceLoggingProvider);
TraceLoggingRegister(g_hV8JSIInspectorTraceLoggingProvider); TraceLoggingRegister(g_hV8JSIInspectorTraceLoggingProvider);
#endif #endif