httpsgithu · pull · Feb 27, 2021 · Feb 25, 2021 · Feb 25, 2021 · Feb 25, 2021
diff --git a/BUILD.gn b/BUILD.gn
diff --git a/COMMON_OWNERS b/COMMON_OWNERS
@@ -1,7 +1,6 @@
 adamk@chromium.org
 ahaas@chromium.org
 bbudge@chromium.org
-binji@chromium.org
 bikineev@chromium.org
 bmeurer@chromium.org
 cbruni@chromium.org
@@ -15,20 +14,22 @@ gsathya@chromium.org
 hablich@chromium.org
 hpayer@chromium.org
 ishell@chromium.org
-jarin@chromium.org
 jgruber@chromium.org
 jkummerow@chromium.org
 leszeks@chromium.org
 machenbach@chromium.org
+manoskouk@chromium.org
 mathias@chromium.org
 marja@chromium.org
 mlippautz@chromium.org
 mslekova@chromium.org
 mvstanton@chromium.org
 mythria@chromium.org
 neis@chromium.org
+nicohartmann@chromium.org
 omerkatz@chromium.org
 petermarshall@chromium.org
+pthier@chromium.org
 rmcilroy@chromium.org
 sigurds@chromium.org
 solanes@chromium.org

diff --git a/DEPS b/DEPS
@@ -88,15 +88,15 @@ vars = {
 
 deps = {
   'build':
-    Var('chromium_url') + '/chromium/src/build.git' + '@' + '446bf3e5a00bfe4fd99d91cb76ec3b3a7b34d226',
+    Var('chromium_url') + '/chromium/src/build.git' + '@' + 'e28b4b7fb55c06c12eb43864a452c3224acda8ea',
   'third_party/depot_tools':
-    Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '5fe664f150beaf71104ce7787560fabdb55ebf5b',
+    Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '8a2e6a7ae010a064744acd16ef26aa27a5df6e34',
   'third_party/icu':
     Var('chromium_url') + '/chromium/deps/icu.git' + '@' + 'e05b663d1c50b4e9ecc3ff9325f5158f1d071471',
   'third_party/instrumented_libraries':
     Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + '0964a78c832d1d0f2669b020b073c38f67509cf2',
   'buildtools':
-    Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + '4c78ef9c38b683c5c5cbac70445378c2362cebfc',
+    Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + 'aa09fa765938e5e16c6309bd9f4ac2a01744ac1d',
   'buildtools/clang_format/script':
     Var('chromium_url') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + '99803d74e35962f63a775f29477882afd4d57d94',
   'buildtools/linux64': {
@@ -122,9 +122,9 @@ deps = {
   'buildtools/third_party/libc++/trunk':
     Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '8fa87946779682841e21e2da977eccfb6cb3bded',
   'buildtools/third_party/libc++abi/trunk':
-    Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '196ba1aaa8ac285d94f4ea8d9836390a45360533',
+    Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '6918862bfc2bff22b45058fac22b1596c49982fb',
   'buildtools/third_party/libunwind/trunk':
-    Var('chromium_url') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'a2cc4f8c554dedcb0c64cac5511b19c43f1f3d32',
+    Var('chromium_url') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + '8d5fb6f1dd53c7cb8fda272eb70f45ac718fc671',
   'buildtools/win': {
     'packages': [
       {
@@ -184,7 +184,7 @@ deps = {
       'dep_type': 'cipd',
   },
   'third_party/catapult': {
-    'url': Var('chromium_url') + '/catapult.git' + '@' + '81c9d30d7f1b3c1ab0f1856761f738cc81741322',
+    'url': Var('chromium_url') + '/catapult.git' + '@' + '62360966a288637071d20581c4933f9471410f9c',
     'condition': 'checkout_android',
   },
   'third_party/colorama/src': {
@@ -239,7 +239,7 @@ deps = {
       'packages': [
           {
               'package': 'fuchsia/third_party/aemu/linux-amd64',
-              'version': 'qI8e328VwkWv64EapCvG3Xj9_hDpKQFuJWeVdUHz7W0C'
+              'version': 'ftKmphEHEwMJc1_tTOsvx50Hd3J_GRNUTxp59ts3NjoC'
           },
       ],
       'condition': 'host_os == "linux" and checkout_fuchsia',
@@ -256,7 +256,7 @@ deps = {
       'dep_type': 'cipd',
   },
   'tools/clang':
-    Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + 'cfd0f628093b7382ac054fb33e23fa9d9a278bc3',
+    Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + '6a9fd91d34f5322be34654a1e85e40ed0a9b14c7',
   'tools/luci-go': {
       'packages': [
         {

diff --git a/ENG_REVIEW_OWNERS b/ENG_REVIEW_OWNERS
@@ -6,4 +6,3 @@ adamk@chromium.org
 danno@chromium.org
 hpayer@chromium.org
 rmcilroy@chromium.org
-yangguo@chromium.org
diff --git a/include/OWNERS b/include/OWNERS
@@ -1,22 +1,16 @@
 adamk@chromium.org
 cbruni@chromium.org
-danno@chromium.org
+leszeks@chromium.org
 mlippautz@chromium.org
 ulan@chromium.org
 verwaest@chromium.org
 yangguo@chromium.org
 
 per-file *DEPS=file:../COMMON_OWNERS
 per-file v8-internal.h=file:../COMMON_OWNERS
-per-file v8-inspector.h=dgozman@chromium.org
-per-file v8-inspector.h=pfeldman@chromium.org
-per-file v8-inspector.h=kozyatinskiy@chromium.org
-per-file v8-inspector-protocol.h=dgozman@chromium.org
-per-file v8-inspector-protocol.h=pfeldman@chromium.org
-per-file v8-inspector-protocol.h=kozyatinskiy@chromium.org
-per-file js_protocol.pdl=dgozman@chromium.org
-per-file js_protocol.pdl=pfeldman@chromium.org
-per-file js_protocol.pdl=bmeurer@chromium.org
+per-file v8-inspector.h=file:../src/inspector/OWNERS
+per-file v8-inspector-protocol.h=file:../src/inspector/OWNERS
+per-file js_protocol.pdl=file:../src/inspector/OWNERS
 
 # For branch updates:
 per-file v8-version.h=file:../INFRA_OWNERS

diff --git a/include/cppgc/heap-state.h b/include/cppgc/heap-state.h
@@ -49,6 +49,17 @@ class V8_EXPORT HeapState final {
    */
   static bool IsInAtomicPause(const HeapHandle& heap_handle);
 
+  /**
+   * Returns whether the last garbage collection was finalized conservatively
+   * (i.e., with a non-empty stack). This API is experimental and is expected to
+   * be removed in future.
+   *
+   * \param heap_handle The corresponding heap.
+   * \returns true if the last garbage collection was finalized conservatively,
+   * and false otherwise.
+   */
+  static bool PreviousGCWasConservative(const HeapHandle& heap_handle);
+
  private:
   HeapState() = delete;
 };

diff --git a/include/cppgc/testing.h b/include/cppgc/testing.h
@@ -18,20 +18,6 @@ class HeapHandle;
  */
 namespace testing {
 
-/**
- * Testing helper used to acces heap internals.
- */
-class V8_EXPORT Heap final {
- public:
-  /**
-   * Atomically collects garbage on the C++ heap.
-   *
-   * \param heap_handle The corresponding heap.
-   * \param stack_state The stack state to assume for the garbage collection.
-   */
-  void CollectGarbage(HeapHandle& heap_handle, EmbedderStackState stack_state);
-};
-
 /**
  * Overrides the state of the stack with the provided value. Takes precedence
  * over other parameters that set the stack state. Must no be nested.

diff --git a/include/cppgc/visitor.h b/include/cppgc/visitor.h
@@ -164,16 +164,21 @@ class V8_EXPORT Visitor {
    * \param key WeakMember reference weakly retaining a key object.
    * \param value Member reference weakly retaining a value object.
    */
-  template <typename K, typename V>
-  void TraceEphemeron(const WeakMember<K>& key, const V* value) {
-    const K* k = key.GetRawAtomic();
+  template <typename KeyType, typename ValueType>
+  void TraceEphemeron(const WeakMember<KeyType>& key, const ValueType* value) {
+    const KeyType* k = key.GetRawAtomic();
     if (!k) return;
-    TraceDescriptor value_desc = TraceTrait<V>::GetTraceDescriptor(value);
+    TraceDescriptor value_desc =
+        TraceTrait<ValueType>::GetTraceDescriptor(value);
+    // KeyType might be a GarbageCollectedMixin.
+    const void* key_base_object_payload =
+        TraceTrait<KeyType>::GetTraceDescriptor(k).base_object_payload;
+    CPPGC_DCHECK(key_base_object_payload);
     // `value` must always be non-null. `value_desc.base_object_payload` may be
     // null in the case that value is not a garbage-collected object but only
     // traceable.
     CPPGC_DCHECK(value);
-    VisitEphemeron(key, value, value_desc);
+    VisitEphemeron(key_base_object_payload, value, value_desc);
   }
 
   /**

diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <vector>
 
+#include "cppgc/common.h"
 #include "cppgc/custom-space.h"
 #include "cppgc/heap-statistics.h"
 #include "cppgc/internal/write-barrier.h"
@@ -118,6 +119,20 @@ class V8_EXPORT CppHeap {
   cppgc::HeapStatistics CollectStatistics(
       cppgc::HeapStatistics::DetailLevel detail_level);
 
+  /**
+   * Enables a detached mode that allows testing garbage collection using
+   * `cppgc::testing` APIs. Once used, the heap cannot be attached to an
+   * `Isolate` anymore.
+   */
+  void EnableDetachedGarbageCollectionsForTesting();
+
+  /**
+   * Performs a stop-the-world garbage collection for testing purposes.
+   *
+   * \param stack_state The stack state to assume for the garbage collection.
+   */
+  void CollectGarbageForTesting(cppgc::EmbedderStackState stack_state);
+
  private:
   CppHeap() = default;
 

diff --git a/include/v8-version.h b/include/v8-version.h
@@ -9,7 +9,7 @@
 // NOTE these macros are used by some of the tool scripts and the build
 // system so their names cannot be changed without changing the scripts.
 #define V8_MAJOR_VERSION 9
-#define V8_MINOR_VERSION 0
+#define V8_MINOR_VERSION 1
 #define V8_BUILD_NUMBER 0
 #define V8_PATCH_LEVEL 0
 

diff --git a/src/asmjs/OWNERS b/src/asmjs/OWNERS
@@ -1,3 +1,2 @@
 ahaas@chromium.org
 clemensb@chromium.org
-titzer@chromium.org
diff --git a/src/ast/OWNERS b/src/ast/OWNERS
@@ -1,8 +1,5 @@
-adamk@chromium.org
-bmeurer@chromium.org
 gsathya@chromium.org
 leszeks@chromium.org
-littledan@chromium.org
 marja@chromium.org
 neis@chromium.org
 verwaest@chromium.org
diff --git a/src/base/platform/OWNERS b/src/base/platform/OWNERS
@@ -1,5 +1,6 @@
 hpayer@chromium.org
 mlippautz@chromium.org
 ulan@chromium.org
+victorgomes@chromium.org
 
 per-file platform-fuchsia.cc=wez@chromium.org
diff --git a/src/base/vlq.h b/src/base/vlq.h
@@ -0,0 +1,85 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_BASE_VLQ_H_
+#define V8_BASE_VLQ_H_
+
+#include <limits>
+#include <vector>
+
+#include "src/base/memory.h"
+
+namespace v8 {
+namespace base {
+
+static constexpr uint32_t kContinueShift = 7;
+static constexpr uint32_t kContinueMask = 1 << kContinueShift;
+static constexpr uint32_t kDataMask = kContinueMask - 1;
+
+// Encodes an unsigned value using variable-length encoding and stores it using
+// the passed process_byte function.
+inline void VLQEncodeUnsigned(const std::function<void(byte)>& process_byte,
+                              uint32_t value) {
+  bool has_next;
+  do {
+    byte cur_byte = value & kDataMask;
+    value >>= kContinueShift;
+    has_next = value != 0;
+    // The most significant bit is set when we are not done with the value yet.
+    cur_byte |= static_cast<uint32_t>(has_next) << kContinueShift;
+    process_byte(cur_byte);
+  } while (has_next);
+}
+
+// Encodes value using variable-length encoding and stores it using the passed
+// process_byte function.
+inline void VLQEncode(const std::function<void(byte)>& process_byte,
+                      int32_t value) {
+  // This wouldn't handle kMinInt correctly if it ever encountered it.
+  DCHECK_NE(value, std::numeric_limits<int32_t>::min());
+  bool is_negative = value < 0;
+  // Encode sign in least significant bit.
+  uint32_t bits = static_cast<uint32_t>((is_negative ? -value : value) << 1) |
+                  static_cast<uint32_t>(is_negative);
+  VLQEncodeUnsigned(process_byte, bits);
+}
+
+// Wrapper of VLQEncode for std::vector backed storage containers.
+template <typename A>
+inline void VLQEncode(std::vector<byte, A>* data, int32_t value) {
+  VLQEncode([data](byte value) { data->push_back(value); }, value);
+}
+
+// Wrapper of VLQEncodeUnsigned for std::vector backed storage containers.
+template <typename A>
+inline void VLQEncodeUnsigned(std::vector<byte, A>* data, uint32_t value) {
+  VLQEncodeUnsigned([data](byte value) { data->push_back(value); }, value);
+}
+
+// Decodes a variable-length encoded unsigned value stored in contiguous memory
+// starting at data_start + index, updating index to where the next encoded
+// value starts.
+inline uint32_t VLQDecodeUnsigned(byte* data_start, int* index) {
+  uint32_t bits = 0;
+  for (int shift = 0; true; shift += kContinueShift) {
+    byte cur_byte = data_start[(*index)++];
+    bits += (cur_byte & kDataMask) << shift;
+    if ((cur_byte & kContinueMask) == 0) break;
+  }
+  return bits;
+}
+
+// Decodes a variable-length encoded value stored in contiguous memory starting
+// at data_start + index, updating index to where the next encoded value starts.
+inline int32_t VLQDecode(byte* data_start, int* index) {
+  uint32_t bits = VLQDecodeUnsigned(data_start, index);
+  bool is_negative = (bits & 1) == 1;
+  int32_t result = bits >> 1;
+  return is_negative ? -result : result;
+}
+
+}  // namespace base
+}  // namespace v8
+
+#endif  // V8_BASE_VLQ_H_
diff --git a/src/baseline/baseline-assembler-inl.h b/src/baseline/baseline-assembler-inl.h
@@ -62,7 +62,7 @@ void BaselineAssembler::LoadRoot(Register output, RootIndex index) {
   __ LoadRoot(output, index);
 }
 void BaselineAssembler::LoadNativeContextSlot(Register output, uint32_t index) {
-  __ LoadNativeContextSlot(index, output);
+  __ LoadNativeContextSlot(output, index);
 }
 
 void BaselineAssembler::Move(Register output, interpreter::Register source) {

diff --git a/src/baseline/baseline-compiler.h b/src/baseline/baseline-compiler.h
@@ -13,6 +13,7 @@
 
 #include "src/base/logging.h"
 #include "src/base/threaded-list.h"
+#include "src/base/vlq.h"
 #include "src/baseline/baseline-assembler.h"
 #include "src/handles/handles.h"
 #include "src/interpreter/bytecode-array-iterator.h"
@@ -33,8 +34,14 @@ namespace baseline {
 class BytecodeOffsetTableBuilder {
  public:
   void AddPosition(size_t pc_offset, size_t bytecode_offset) {
-    WriteUint(pc_offset - previous_pc_);
-    WriteUint(bytecode_offset - previous_bytecode_);
+    size_t pc_diff = pc_offset - previous_pc_;
+    size_t bytecode_diff = bytecode_offset - previous_bytecode_;
+    DCHECK_GE(pc_diff, 0);
+    DCHECK_LE(pc_diff, std::numeric_limits<uint32_t>::max());
+    DCHECK_GE(bytecode_diff, 0);
+    DCHECK_LE(bytecode_diff, std::numeric_limits<uint32_t>::max());
+    base::VLQEncodeUnsigned(&bytes_, static_cast<uint32_t>(pc_diff));
+    base::VLQEncodeUnsigned(&bytes_, static_cast<uint32_t>(bytecode_diff));
     previous_pc_ = pc_offset;
     previous_bytecode_ = bytecode_offset;
   }
@@ -43,17 +50,6 @@ class BytecodeOffsetTableBuilder {
   Handle<ByteArray> ToBytecodeOffsetTable(LocalIsolate* isolate);
 
  private:
-  void WriteUint(size_t value) {
-    bool has_next;
-    do {
-      uint8_t byte = value & ((1 << 7) - 1);
-      value >>= 7;
-      has_next = value != 0;
-      byte |= (has_next << 7);
-      bytes_.push_back(byte);
-    } while (has_next);
-  }
-
   size_t previous_pc_ = 0;
   size_t previous_bytecode_ = 0;
   std::vector<byte> bytes_;