Version 2.13.0-95.0.dev
Merge commit '7fc9a1a14c1538ff2b2e6d27b0c6d67e1e77481a' into 'dev'
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc
index 2cc879a..dfbeeef 100644
--- a/runtime/lib/mirrors.cc
+++ b/runtime/lib/mirrors.cc
@@ -666,7 +666,7 @@
ThrowLanguageError("no library handler registered");
}
- NoReloadScope no_reload(isolate->group(), thread);
+ NoReloadScope no_reload(thread);
// Canonicalize library URI.
String& canonical_uri = String::Handle(zone);
diff --git a/runtime/vm/compiler/jit/compiler.cc b/runtime/vm/compiler/jit/compiler.cc
index 9372d86..6a32a25 100644
--- a/runtime/vm/compiler/jit/compiler.cc
+++ b/runtime/vm/compiler/jit/compiler.cc
@@ -694,8 +694,6 @@
intptr_t osr_id) {
ASSERT(!FLAG_precompiled_mode);
ASSERT(!optimized || function.WasCompiled() || function.ForceOptimize());
- ASSERT(function.is_background_optimizable() ||
- !Compiler::IsBackgroundCompilation());
if (function.ForceOptimize()) optimized = true;
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
@@ -744,18 +742,13 @@
if (error.ptr() == Object::background_compilation_error().ptr()) {
if (FLAG_trace_compiler) {
THR_Print(
- "--> disabling background optimizations for '%s' (will "
- "try to re-compile on isolate thread again)\n",
+ "--> discarding background compilation for '%s' (will "
+ "try to re-compile again later)\n",
function.ToFullyQualifiedCString());
}
- // Ensure we don't attempt to re-compile the function on the
- // background compiler.
- function.set_is_background_optimizable(false);
-
- // Trigger another optimization soon on the main thread.
- function.SetUsageCounter(
- optimized ? FLAG_optimization_counter_threshold : 0);
+ // Trigger another optimization pass soon.
+ function.SetUsageCounter(FLAG_optimization_counter_threshold - 100);
return Error::null();
} else if (error.IsLanguageError() &&
LanguageError::Cast(error).kind() == Report::kBailout) {
@@ -1171,8 +1164,7 @@
// the background queue (unless it was passed to foreground).
if ((!old.HasOptimizedCode() && old.IsOptimizable()) ||
FLAG_stress_test_background_compilation) {
- if (old.is_background_optimizable() &&
- Compiler::CanOptimizeFunction(thread, old)) {
+ if (Compiler::CanOptimizeFunction(thread, old)) {
QueueElement* repeat_qelem = new QueueElement(old);
function_queue()->Add(repeat_qelem);
}
diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc
index 1d76750..306c122 100644
--- a/runtime/vm/exceptions.cc
+++ b/runtime/vm/exceptions.cc
@@ -1191,7 +1191,7 @@
}
Thread* thread = Thread::Current();
- NoReloadScope no_reload_scope(thread->isolate_group(), thread);
+ NoReloadScope no_reload_scope(thread);
return DartLibraryCalls::InstanceCreate(library, *class_name,
*constructor_name, arguments);
}
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 16333fb..eda476f 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -866,22 +866,6 @@
}
}
-NoReloadScope::NoReloadScope(IsolateGroup* isolate_group, Thread* thread)
- : ThreadStackResource(thread), isolate_group_(isolate_group) {
-#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
- ASSERT(isolate_group_ != NULL);
- isolate_group_->no_reload_scope_depth_.fetch_add(1);
- ASSERT(isolate_group_->no_reload_scope_depth_ >= 0);
-#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
-}
-
-NoReloadScope::~NoReloadScope() {
-#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
- isolate_group_->no_reload_scope_depth_.fetch_sub(1);
- ASSERT(isolate_group_->no_reload_scope_depth_ >= 0);
-#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
-}
-
Bequest::~Bequest() {
IsolateGroup* isolate_group = IsolateGroup::Current();
CHECK_ISOLATE_GROUP(isolate_group);
@@ -1500,7 +1484,7 @@
T->isolate()->name(), result.ToErrorCString());
}
- NoReloadScope no_reload_scope(T->isolate_group(), T);
+ NoReloadScope no_reload(T);
// Generate the error and stacktrace strings for the error message.
const char* exception_cstr = nullptr;
const char* stacktrace_cstr = nullptr;
@@ -2002,13 +1986,14 @@
#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
bool IsolateGroup::CanReload() {
+ auto thread = Thread::Current();
// TODO(dartbug.com/36097): As part of implementing hot-reload support for
// --enable-isolate-groups, we should make the reload implementation wait for
// any outstanding isolates to "check-in" (which should only be done after
// making them runnable) instead of refusing the reload.
bool all_runnable = true;
{
- SafepointReadRwLocker ml(Thread::Current(), isolates_lock_.get());
+ SafepointReadRwLocker ml(thread, isolates_lock_.get());
for (Isolate* isolate : isolates_) {
if (!isolate->is_runnable()) {
all_runnable = false;
@@ -2017,7 +2002,7 @@
}
}
return !IsolateGroup::IsSystemIsolateGroup(this) && all_runnable &&
- !IsReloading() && (no_reload_scope_depth_ == 0) &&
+ !IsReloading() && (thread->no_reload_scope_depth_ == 0) &&
Isolate::IsolateCreationEnabled() &&
OSThread::Current()->HasStackHeadroom(64 * KB);
}
diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
index a32105a..cdc35c8 100644
--- a/runtime/vm/isolate.h
+++ b/runtime/vm/isolate.h
@@ -154,17 +154,6 @@
DISALLOW_COPY_AND_ASSIGN(NoOOBMessageScope);
};
-// Disallow isolate reload.
-class NoReloadScope : public ThreadStackResource {
- public:
- NoReloadScope(IsolateGroup* isolate_group, Thread* thread);
- ~NoReloadScope();
-
- private:
- IsolateGroup* isolate_group_;
- DISALLOW_COPY_AND_ASSIGN(NoReloadScope);
-};
-
// Fixed cache for exception handler lookup.
typedef FixedCache<intptr_t, ExceptionHandlerInfo, 16> HandlerInfoCache;
// Fixed cache for catch entry state lookup.
@@ -826,7 +815,6 @@
friend class StackFrame; // For `[isolates_].First()`.
// For `object_store_shared_untag()`, `class_table_shared_untag()`
friend class Isolate;
- friend class NoReloadScope; // no_reload_scope_depth_
#define ISOLATE_GROUP_FLAG_BITS(V) \
V(AllClassesFinalized) \
@@ -882,8 +870,6 @@
#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
int64_t last_reload_timestamp_;
std::shared_ptr<IsolateGroupReloadContext> group_reload_context_;
- RelaxedAtomic<intptr_t> no_reload_scope_depth_ =
- 0; // we can only reload when this is 0.
// Per-isolate-group copy of FLAG_reload_every.
RelaxedAtomic<intptr_t> reload_every_n_stack_overflow_checks_;
ProgramReloadContext* program_reload_context_ = nullptr;
diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc
index 7dc46ad..2a4f3fe 100644
--- a/runtime/vm/kernel_loader.cc
+++ b/runtime/vm/kernel_loader.cc
@@ -500,7 +500,7 @@
Thread* thread = Thread::Current();
NoOOBMessageScope no_msg_scope(thread);
- NoReloadScope no_reload_scope(thread->isolate_group(), thread);
+ NoReloadScope no_reload_scope(thread);
Function& function = Function::Handle();
Library& library = Library::Handle();
@@ -2096,7 +2096,7 @@
} else {
Thread* thread = Thread::Current();
NoOOBMessageScope no_msg_scope(thread);
- NoReloadScope no_reload_scope(thread->isolate_group(), thread);
+ NoReloadScope no_reload_scope(thread);
library.GetMetadata(function);
}
}
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 007ceb4..0c844ca 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -8719,7 +8719,6 @@
NOT_IN_PRECOMPILED(result.set_inlining_depth(0));
NOT_IN_PRECOMPILED(result.set_kernel_offset(0));
result.set_is_optimizable(is_native ? false : true);
- result.set_is_background_optimizable(is_native ? false : true);
result.set_is_inlinable(true);
result.reset_unboxed_parameters_and_return();
result.SetInstructionsSafe(StubCode::LazyCompile());
@@ -10842,7 +10841,7 @@
#endif // !defined(DART_PRECOMPILED_RUNTIME)
NoOOBMessageScope no_msg_scope(thread);
- NoReloadScope no_reload_scope(thread->isolate_group(), thread);
+ NoReloadScope no_reload_scope(thread);
const Function& initializer = Function::Handle(EnsureInitializerFunction());
return DartEntry::InvokeFunction(initializer, Object::empty_array());
}
@@ -18063,7 +18062,7 @@
const char* LanguageError::ToErrorCString() const {
Thread* thread = Thread::Current();
- NoReloadScope no_reload_scope(thread->isolate_group(), thread);
+ NoReloadScope no_reload_scope(thread);
const String& msg_str = String::Handle(FormatMessage());
return msg_str.ToCString();
}
@@ -18113,7 +18112,7 @@
const char* UnhandledException::ToErrorCString() const {
Thread* thread = Thread::Current();
auto isolate_group = thread->isolate_group();
- NoReloadScope no_reload_scope(isolate_group, thread);
+ NoReloadScope no_reload_scope(thread);
HANDLESCOPE(thread);
Object& strtmp = Object::Handle();
const char* exc_str;
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index 326cc5b..38f7766 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -3655,18 +3655,6 @@
value, untag()->packed_fields_));
}
- // Indicates whether this function can be optimized on the background compiler
- // thread.
- bool is_background_optimizable() const {
- return UntaggedFunction::PackedBackgroundOptimizable::decode(
- untag()->packed_fields_);
- }
-
- void set_is_background_optimizable(bool value) const {
- set_packed_fields(UntaggedFunction::PackedBackgroundOptimizable::update(
- value, untag()->packed_fields_));
- }
-
enum KindTagBits {
kKindTagPos = 0,
kKindTagSize = 5,
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index 21fe968..0ba396b 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -1148,7 +1148,6 @@
// TODO(regis): Split packed_fields_ in 2 uint32_t if max values are too low.
static constexpr intptr_t kMaxOptimizableBits = 1;
- static constexpr intptr_t kMaxBackgroundOptimizableBits = 1;
static constexpr intptr_t kMaxTypeParametersBits = 7;
static constexpr intptr_t kMaxHasNamedOptionalParametersBits = 1;
static constexpr intptr_t kMaxFixedParametersBits = 10;
@@ -1156,13 +1155,8 @@
typedef BitField<uint32_t, bool, 0, kMaxOptimizableBits> PackedOptimizable;
typedef BitField<uint32_t,
- bool,
- PackedOptimizable::kNextBit,
- kMaxBackgroundOptimizableBits>
- PackedBackgroundOptimizable;
- typedef BitField<uint32_t,
uint8_t,
- PackedBackgroundOptimizable::kNextBit,
+ PackedOptimizable::kNextBit,
kMaxTypeParametersBits>
PackedNumTypeParameters;
typedef BitField<uint32_t,
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index c54e46f..130f9dd 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -2552,7 +2552,7 @@
const char* script_uri;
{
- NoReloadScope no_reload(isolate_group, thread);
+ NoReloadScope no_reload(thread);
const Library& lib =
Library::Handle(isolate_group->object_store()->_internal_library());
const Class& cls = Class::Handle(
@@ -2775,8 +2775,7 @@
if (Compiler::CanOptimizeFunction(thread, function)) {
auto isolate_group = thread->isolate_group();
if (FLAG_background_compilation) {
- if (function.is_background_optimizable() &&
- isolate_group->background_compiler()->EnqueueCompilation(function)) {
+ if (isolate_group->background_compiler()->EnqueueCompilation(function)) {
// Reduce the chance of triggering a compilation while the function is
// being compiled in the background. INT32_MIN should ensure that it
// takes long time to trigger a compilation.
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index 40849d6e..1a8b670 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -565,6 +565,8 @@
#endif
}
+ bool IsInNoReloadScope() const { return no_reload_scope_depth_ > 0; }
+
#define DEFINE_OFFSET_METHOD(type_name, member_name, expr, default_init_value) \
static intptr_t member_name##offset() { \
return OFFSET_OF(Thread, member_name); \
@@ -1000,6 +1002,7 @@
mutable Monitor thread_lock_;
ApiLocalScope* api_reusable_scope_;
int32_t no_callback_scope_depth_;
+ intptr_t no_reload_scope_depth_ = 0;
#if defined(DEBUG)
int32_t no_safepoint_scope_depth_;
#endif
@@ -1088,6 +1091,7 @@
friend class IsolateGroup;
friend class IsolateTestHelper;
friend class NoOOBMessageScope;
+ friend class NoReloadScope;
friend class Simulator;
friend class StackZone;
friend class ThreadRegistry;
@@ -1137,6 +1141,28 @@
};
#endif // defined(DEBUG)
+class NoReloadScope : public ThreadStackResource {
+ public:
+ explicit NoReloadScope(Thread* thread)
+ : ThreadStackResource(thread), thread_(thread) {
+#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
+ thread->no_reload_scope_depth_++;
+ ASSERT(thread->no_reload_scope_depth_ >= 0);
+#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
+ }
+
+ ~NoReloadScope() {
+#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
+ thread_->no_reload_scope_depth_ -= 1;
+ ASSERT(thread_->no_reload_scope_depth_ >= 0);
+#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
+ }
+
+ private:
+ Thread* thread_;
+ DISALLOW_COPY_AND_ASSIGN(NoReloadScope);
+};
+
// Within a EnterCompilerScope, the thread must operate on cloned fields.
#if defined(DEBUG)
class EnterCompilerScope : public ThreadStackResource {
diff --git a/tools/VERSION b/tools/VERSION
index a23974c..b89a1ff 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 13
PATCH 0
-PRERELEASE 94
+PRERELEASE 95
PRERELEASE_PATCH 0
\ No newline at end of file
