From 4beb33a981228ea7b0ff75954b680ff9c1dacdc4 Mon Sep 17 00:00:00 2001 From: Alexander Markov Date: Tue, 15 Jan 2019 14:50:19 -0800 Subject: [PATCH 1/3] Cleanup Dart sticky errors API and roll tonic --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 2 -- runtime/dart_isolate.cc | 12 ------------ runtime/dart_vm.cc | 1 - 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/DEPS b/DEPS index e4e1858968e52..8725dc8a4993f 100644 --- a/DEPS +++ b/DEPS @@ -125,7 +125,7 @@ deps = { # and not have to specific specific hashes. 'src/third_party/tonic': - Var('fuchsia_git') + '/tonic' + '@' + '5c9c2b63091ffd6000d44a3b5ff86e4f349e6978', + Var('fuchsia_git') + '/tonic' + '@' + '4634b29a24ccfc0fcfafcc8196ef30131185ad88', 'src/third_party/benchmark': Var('fuchsia_git') + '/third_party/benchmark' + '@' + '21f1eb3fe269ea43eba862bf6b699cde46587ade', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 0e65a36502e3c..a9535aea8e2e5 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -17564,8 +17564,6 @@ FILE: ../../../third_party/tonic/dart_message_handler.cc FILE: ../../../third_party/tonic/dart_message_handler.h FILE: ../../../third_party/tonic/dart_microtask_queue.cc FILE: ../../../third_party/tonic/dart_microtask_queue.h -FILE: ../../../third_party/tonic/dart_sticky_error.cc -FILE: ../../../third_party/tonic/dart_sticky_error.h FILE: ../../../third_party/tonic/file_loader/file_loader.cc FILE: ../../../third_party/tonic/file_loader/file_loader.h FILE: ../../../third_party/tonic/filesystem/filesystem/eintr_wrapper.h diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc index c3a0a4c80373d..f6ce915467d92 100644 --- a/runtime/dart_isolate.cc +++ b/runtime/dart_isolate.cc @@ -21,7 +21,6 @@ #include "third_party/tonic/dart_class_provider.h" #include "third_party/tonic/dart_message_handler.h" #include "third_party/tonic/dart_state.h" -#include "third_party/tonic/dart_sticky_error.h" #include "third_party/tonic/file_loader/file_loader.h" #include "third_party/tonic/scopes/dart_api_scope.h" #include "third_party/tonic/scopes/dart_isolate_scope.h" @@ -701,17 +700,6 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( // |Dart_IsolateShutdownCallback| void DartIsolate::DartIsolateShutdownCallback( std::shared_ptr* embedder_isolate) { - if (!tonic::DartStickyError::IsSet()) { - return; - } - - tonic::DartApiScope api_scope; - Dart_Handle sticky_error = Dart_GetStickyError(); - if (!Dart_IsFatalError(sticky_error)) { - FML_LOG(ERROR) << "Isolate " << tonic::StdStringFromDart(Dart_DebugName()) - << " exited with an error"; - FML_CHECK(tonic::LogIfError(sticky_error)); - } } // |Dart_IsolateCleanupCallback| diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 76613f6e4aa47..795a424bb9733 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -27,7 +27,6 @@ #include "third_party/tonic/converter/dart_converter.h" #include "third_party/tonic/dart_class_library.h" #include "third_party/tonic/dart_class_provider.h" -#include "third_party/tonic/dart_sticky_error.h" #include "third_party/tonic/file_loader/file_loader.h" #include "third_party/tonic/logging/dart_error.h" #include "third_party/tonic/scopes/dart_api_scope.h" From 63623c77362c09e8e569bd3f9d75b1bee3e615da Mon Sep 17 00:00:00 2001 From: Alexander Markov Date: Tue, 15 Jan 2019 14:59:10 -0800 Subject: [PATCH 2/3] Formatting --- runtime/dart_isolate.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc index f6ce915467d92..c7c81880bfbd2 100644 --- a/runtime/dart_isolate.cc +++ b/runtime/dart_isolate.cc @@ -699,8 +699,7 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( // |Dart_IsolateShutdownCallback| void DartIsolate::DartIsolateShutdownCallback( - std::shared_ptr* embedder_isolate) { -} + std::shared_ptr* embedder_isolate) {} // |Dart_IsolateCleanupCallback| void DartIsolate::DartIsolateCleanupCallback( From 93b869cb967e31aa7045865aca5a25c478186b08 Mon Sep 17 00:00:00 2001 From: Alexander Markov Date: Tue, 15 Jan 2019 15:20:38 -0800 Subject: [PATCH 3/3] Update licenses signature --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index a9535aea8e2e5..2224e2a750a66 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 79fce3f902a2d69ac126c0f94940eb0b +Signature: 4cafa002301d7d7ff1128bd3f37e6406 UNUSED LICENSES: