Version 3.3.0-80.0.dev

Merge 4eede85 into dev
dart-lang · Oct 31, 2023 · 2a80a8a · 2a80a8a
2 parents 9cc76cb + 4eede85
commit 2a80a8a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 14 deletions.
diff --git a/DEPS b/DEPS
@@ -146,7 +146,7 @@ vars = {
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "2cee560f2025f8bd5dce3fd5f4c4b5cf5335a10b", # disable rev_sdk_deps.dart
-  "dartdoc_rev": "53da3e1dd1802c5899352fce251ea0c385a827b0",
+  "dartdoc_rev": "53da3e1dd1802c5899352fce251ea0c385a827b0", # https://github.com/dart-lang/dartdoc/issues/3562
   "ecosystem_rev": "4acfcaf382225ba7eeba00f38632fc6b2fd39754",
   "ffi_rev": "2faec288966d8f564049adb86a7ca43fd6e01fbf",
   "file_rev": "7418131cfe3c5e063166bc3d7cca98985a6d8eeb",
@@ -160,18 +160,18 @@ vars = {
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "json_rpc_2_rev": "0521afb58b9aeb90beda8fa5b00b98b998ec9ba6",
   "leak_tracker_rev": "098bafcf99a5220e3c352d895d991e163568ee03", # b/299640139
-  "lints_rev": "2cf8403407168d5a1e5c8faed443d4d140308c91",
+  "lints_rev": "5c60f48a17e3e6c34dcbcd51fa16b11802340471",
   "logging_rev": "642ed2124f7ef7abc819a0e22ae0c7afdb5398d3",
   "markdown_rev": "4e2e9701d87058311857d06fd7f5df54e8f86c53",
   "matcher_rev": "7512f8056486f6b0855ec9307ce0f93902c329e7",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "mime_rev": "af3e5fe753b957e95f03838f8a63782582c413ca",
-  "mockito_rev": "4edf86ffe358462eafcb94fa3cbcb578d7cc6c6b",
-  "native_rev": "757f5034bb3cb9cf9db1b268fccea028d6b0f6a6",
+  "mockito_rev": "b7d752e7f696ac0a1b1567a7abb8073b9d581a07",
+  "native_rev": "279094d73780f7c128b70f14b7232d5bd478bf2a",
   "package_config_rev": "100533d2f836583f281c9dfa11a00d6842c176d4",
   "path_rev": "4ca27d4e88d47f2d96c3113940a97321b6aa7175",
   "pool_rev": "5ccef15fcd4690d96e22e60c3962f4c97d9430f9",
-  "protobuf_rev": "3528fad58b591692f734c49481d9ed16db50518c",
+  "protobuf_rev": "3f567b29cc8979b9e355b746aa57805c08cb72e9",
   "pub_rev": "fca927ae2662204805e1646c0c0687369001a41a", # disable rev_sdk_deps.dart
   "pub_semver_rev": "8e5a58fd4231854b35ac585ff81c242885334843",
   "shelf_rev": "c15fc6f6ae11079d7796b0bf8c93135a5a112d82",
@@ -189,13 +189,13 @@ vars = {
   "test_descriptor_rev": "55b5eac522cc10bd5b2280b1f0cc367b0b69c472",
   "test_process_rev": "d610333f099884ef91660bffb72d7c668cec5b4c",
   "test_reflective_loader_rev": "8593eb160f796179f77c8edb6fde050433810211",
-  "tools_rev": "da6bb184c9eb18e344cf37ab1a34aa04b1057edc",
+  "tools_rev": "e828d4504ab1cf2478a2de503f6d90284585d4d5",
   "typed_data_rev": "d1c15ed29d10568cd713fba77d01c4d79b03ccf8",
   "usage_rev": "d7d2964433f26b9a3c60dc9c6677f00c005ee9fb",
   "vector_math_rev": "294896dedc6da2a736f47c3c6a19643df934641c",
   "watcher_rev": "6ad58dcbbf328fbecf18d6ad2357c67be300b489",
   "web_socket_channel_rev": "f3ac1bf2bd3c93eb6d5d78646ff7de31797f4cf6",
-  "webdev_rev": "25f17cda837042e8b4f7aec5192c68bef0d3c387",
+  "webdev_rev": "50534a1299d1fdcac065ac337abcad26886ff029",
   "webdriver_rev": "eaf9c582e6e72c3551d3a875b2d522cd1ad06593",
   "webkit_inspection_protocol_rev": "82f0c1c46dfdba5edf7c5fa84456233121dd69e1",
   "yaml_rev": "9f0d64934c07bc27438074616455618b7103582d",

diff --git a/runtime/bin/ffi_test/ffi_test_functions.cc b/runtime/bin/ffi_test/ffi_test_functions.cc
@@ -734,24 +734,41 @@ DART_EXPORT int64_t SumStruct9Uint8(Struct9Uint8 s9) {
   return s9.a0 + s9.a1 + s9.a2 + s9.a3 + s9.a4 + s9.a5 + s9.a6 + s9.a7 + s9.a8;
 }
 
+// Allocates a multiple of the larest page size, so the last element of the
+// array is right at a page boundary. Explicitly allocate and make inaccessible
+// the next page to avoid flaky false-successes if the next page happens to be
+// allocated.
 DART_EXPORT Struct9Uint8* AllocStruct9Uint8() {
   size_t size = sizeof(Struct9Uint8) * 64 * 1024;
 #if defined(_WIN32)
-  return reinterpret_cast<Struct9Uint8*>(
-      VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE));
+  void* result =
+      VirtualAlloc(nullptr, size * 2, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
+  void* guard_page =
+      reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(result) + size);
+  DWORD old_prot;
+  if (VirtualProtect(guard_page, size, PAGE_NOACCESS, &old_prot) == 0) {
+    fprintf(stderr, "VirtualProtect failed\n");
+    abort();
+  }
 #else
-  return reinterpret_cast<Struct9Uint8*>(
-      mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS,
-           -1, 0));
+  void* result = mmap(nullptr, size * 2, PROT_READ | PROT_WRITE,
+                      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  void* guard_page =
+      reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(result) + size);
+  if (mprotect(guard_page, size, PROT_NONE) != 0) {
+    fprintf(stderr, "mprotect failed\n");
+    abort();
+  }
 #endif
+  return reinterpret_cast<Struct9Uint8*>(result);
 }
 
 DART_EXPORT void FreeStruct9Uint8(Struct9Uint8* address) {
 #if defined(_WIN32)
   VirtualFree(address, 0, MEM_RELEASE);
 #else
   size_t size = sizeof(Struct9Uint8) * 64 * 1024;
-  munmap(address, size);
+  munmap(address, size * 2);
 #endif
 }
 

diff --git a/tests/lib/lib_dart2js.status b/tests/lib/lib_dart2js.status
@@ -57,6 +57,7 @@ html/file_sample_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_throws_test: Skip # FileSystem not supported on FireFox.
 html/history_test: Skip # Issue 22050
+html/mediadevices_test: SkipByDesign # Not supported on FF, likely requires user-interaction that causes timeout
 html/request_animation_frame_test: Skip # Async test hangs.
 
 [ $compiler == dart2js && $runtime == safari ]

diff --git a/tests/lib/lib_dartdevc.status b/tests/lib/lib_dartdevc.status
@@ -31,6 +31,9 @@ typed_data/typed_data_hierarchy_int64_test: SkipByDesign # ddc does not support
 [ $compiler == ddc && $runtime == chrome ]
 html/js_dispatch_property_test: Skip # Timeout Issue 31030
 
+[ $compiler == ddc && $runtime == ff ]
+html/mediadevices_test: SkipByDesign # Not supported on FF, likely requires user-interaction that causes timeout
+
 [ $compiler == ddc && $system == linux ]
 html/interactive_geolocation_test: Skip # Requires allowing geo location.
 

diff --git a/tests/lib_2/lib_2_dart2js.status b/tests/lib_2/lib_2_dart2js.status
@@ -55,6 +55,7 @@ html/file_sample_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_test: Skip # FileSystem not supported on FireFox.
 html/fileapi_supported_throws_test: Skip # FileSystem not supported on FireFox.
 html/history_test: Skip # Issue 22050
+html/mediadevices_test: SkipByDesign # Not supported on FF, likely requires user-interaction that causes timeout
 html/request_animation_frame_test: Skip # Async test hangs.
 
 [ $compiler == dart2js && $runtime == safari ]

diff --git a/tests/lib_2/lib_2_dartdevc.status b/tests/lib_2/lib_2_dartdevc.status
@@ -29,6 +29,9 @@ mirrors/*: SkipByDesign # Mirrors not supported on web in Dart 2.0.
 [ $compiler == ddc && $runtime == chrome ]
 html/js_dispatch_property_test: Skip # Timeout Issue 31030
 
+[ $compiler == ddc && $runtime == ff ]
+html/mediadevices_test: SkipByDesign # Not supported on FF, likely requires user-interaction that causes timeout
+
 [ $compiler == ddc && $system == linux ]
 html/interactive_geolocation_test: Skip # Requires allowing geo location.
 

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 3
 PATCH 0
-PRERELEASE 79
+PRERELEASE 80
 PRERELEASE_PATCH 0