Version 2.18.0-11.0.dev
Merge commit 'a3478da7faa334564642406bd58fe5413190508c' into 'dev'
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 52beba4..2196982 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -224,7 +224,7 @@
result = DartUtils::ResolveScript(Dart_NewStringFromCString(script_uri));
if (Dart_IsError(result)) goto failed;
- if (isolate_group_data->kernel_buffer().get() != nullptr) {
+ if (isolate_group_data->kernel_buffer() != nullptr) {
// Various core-library parts will send requests to the Loader to resolve
// relative URIs and perform other related tasks. We need Loader to be
// initialized for this to work because loading from Kernel binary
diff --git a/runtime/bin/secure_socket_filter.cc b/runtime/bin/secure_socket_filter.cc
index a78b635..8a3fb56 100644
--- a/runtime/bin/secure_socket_filter.cc
+++ b/runtime/bin/secure_socket_filter.cc
@@ -583,8 +583,8 @@
DartUtils::GetNativeBooleanArgument(args, 2)));
if (SSL_LOG_STATUS) {
Syslog::Print("Mark %p as %strusted certificate\n",
- certificate_trust_state_.get()->x509(),
- certificate_trust_state_.get()->is_trusted() ? "" : "not ");
+ certificate_trust_state_->x509(),
+ certificate_trust_state_->is_trusted() ? "" : "not ");
}
}
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 6541884..ae4909f 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -2647,7 +2647,7 @@
// Post message before LowLevelShutdown that sends onExit message.
// This ensures that exit message comes last.
- if (bequest_.get() != nullptr) {
+ if (bequest_ != nullptr) {
auto beneficiary = bequest_->beneficiary();
auto handle = bequest_->TakeHandle();
PortMap::PostMessage(
diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc
index a04ea6f..1386624 100644
--- a/runtime/vm/isolate_reload.cc
+++ b/runtime/vm/isolate_reload.cc
@@ -588,7 +588,7 @@
NoActiveIsolateScope no_active_isolate_scope;
ExternalTypedData& external_typed_data =
- ExternalTypedData::Handle(Z, kernel_program.get()->typed_data()->ptr());
+ ExternalTypedData::Handle(Z, kernel_program->typed_data()->ptr());
IsolateGroupSource* source = IsolateGroup::Current()->source();
source->add_loaded_blob(Z, external_typed_data);
diff --git a/tools/VERSION b/tools/VERSION
index d85812f..88dbd87 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 10
+PRERELEASE 11
PRERELEASE_PATCH 0
\ No newline at end of file
