Version 1.17.0-dev.4.1
Cherry-pick '8babc61b57094cd8980ffe180018d3a7e8d2f371' into dev
diff --git a/runtime/vm/compiler.cc b/runtime/vm/compiler.cc
index 50e2e55..7685b3c 100644
--- a/runtime/vm/compiler.cc
+++ b/runtime/vm/compiler.cc
@@ -1565,14 +1565,13 @@
// evaluating the initializer value.
ASSERT(field.StaticValue() == Object::transition_sentinel().raw());
LongJumpScope jump;
- Thread* thread = Thread::Current();
if (setjmp(*jump.Set()) == 0) {
+ Thread* const thread = Thread::Current();
NoOOBMessageScope no_msg_scope(thread);
NoReloadScope no_reload_scope(thread->isolate(), thread);
// Under lazy compilation initializer has not yet been created, so create
// it now, but don't bother remembering it because it won't be used again.
ASSERT(!field.HasPrecompiledInitializer());
- Thread* const thread = Thread::Current();
Function& initializer = Function::Handle(thread->zone());
{
NOT_IN_PRODUCT(
diff --git a/tools/VERSION b/tools/VERSION
index 16386c7..2739e60 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 17
PATCH 0
PRERELEASE 4
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
