languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 23:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add fixnum deps patch for flutter hhh bots

Browse source 
Change-Id: Ib028d99923c52d06a7b43f223d3abfe469820b20
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152611
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Jake Macdonald <jakemac@google.com>
This commit is contained in:
Jacob MacDonald 2020-06-26 19:16:10 +00:00 committed by commit-bot@chromium.org
parent e24733ebd1
commit 25d8ae53c1
2 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/patches/flutter-engine/bebc7d3af5bded5ea3f549e90b42c264fe9d1d45.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/DEPS b/DEPS
index 42d057195..716e4b181 100644
--- a/DEPS
+++ b/DEPS
@@ -53,7 +53,7 @@ vars = {
'dart_dart2js_info_tag': '0.6.0',
'dart_dart_style_tag': '1.3.2',
'dart_ffi_tag': 'ea88d71b043ee14b268c3aedff14e9eb32e20959',
- 'dart_fixnum_tag': '0.10.9',
+ 'dart_fixnum_tag': '9b38f49f6679654d66a363e69e48173cca07e882',
'dart_glob_tag': '1.1.7',
'dart_html_tag': '0.14.0+1',
'dart_http_multi_server_tag': '2.0.5',

32
tools/patches/flutter-engine/e7e45599cb1a74ff88d7d00a33f25029e42df757.patch
View file

@ -1,32 +0,0 @@
diff --git a/third_party/tonic/dart_persistent_value.cc b/third_party/tonic/dart_persistent_value.cc
index 9ed6f70f3532..3bc46505d31f 100644
--- a/third_party/tonic/dart_persistent_value.cc
+++ b/third_party/tonic/dart_persistent_value.cc
@@ -43,8 +43,12 @@ void DartPersistentValue::Clear() {
return;
}
- DartIsolateScope scope(dart_state->isolate());
- Dart_DeletePersistentHandle(value_);
+ if (Dart_CurrentIsolateGroup()) {
+ Dart_DeletePersistentHandle(value_);
+ } else {
+ DartIsolateScope scope(dart_state->isolate());
+ Dart_DeletePersistentHandle(value_);
+ }
dart_state_.reset();
value_ = nullptr;
}
diff --git a/third_party/tonic/dart_wrappable.cc b/third_party/tonic/dart_wrappable.cc
index 42c8fff2805b..89064ac8eef7 100644
--- a/third_party/tonic/dart_wrappable.cc
+++ b/third_party/tonic/dart_wrappable.cc
@@ -37,7 +37,7 @@ void DartWrappable::ClearDartWrapper() {
TONIC_CHECK(!LogIfError(Dart_SetNativeInstanceField(wrapper, kPeerIndex, 0)));
TONIC_CHECK(
!LogIfError(Dart_SetNativeInstanceField(wrapper, kWrapperInfoIndex, 0)));
- Dart_DeleteWeakPersistentHandle(Dart_CurrentIsolate(), dart_wrapper_);
+ Dart_DeleteWeakPersistentHandle(dart_wrapper_);
dart_wrapper_ = nullptr;
this->ReleaseDartWrappableReference();
}