Skip to content

Commit

Permalink
Version 3.0.0-270.0.dev
Browse files Browse the repository at this point in the history 
Merge 27cfabd into dev
  • Loading branch information
Dart CI committed Feb 24, 2023
2 parents 9f07e6b + 27cfabd commit a101430
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 123 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ vars = {

# co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
# hashes.
"co19_rev": "8db40c0c17735ac9f84cbc7d014bfde9f14240fd",
"co19_rev": "7b4f3e723211011878e185db6fa57fbafabd6bb7",
# This line prevents conflicts when both packages are rolled simultaneously.
"co19_2_rev": "93b818c9cf570a63cbea56508e393770787fd5ab",

Expand Down
48 changes: 24 additions & 24 deletions runtime/tests/vm/dart/splay_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@
// objects, and between marked and unmarked objects.

// VMOptions=
// VMOptions=--no_concurrent_mark --no_concurrent_sweep
// VMOptions=--no_concurrent_mark --concurrent_sweep
// VMOptions=--no_concurrent_mark --use_compactor
// VMOptions=--no_concurrent_mark --use_compactor --force_evacuation
// VMOptions=--concurrent_mark --no_concurrent_sweep
// VMOptions=--concurrent_mark --concurrent_sweep
// VMOptions=--concurrent_mark --use_compactor
// VMOptions=--concurrent_mark --use_compactor --force_evacuation
// VMOptions=--scavenger_tasks=0
// VMOptions=--scavenger_tasks=1
// VMOptions=--scavenger_tasks=2
// VMOptions=--scavenger_tasks=3
// VMOptions=--verify_before_gc
// VMOptions=--verify_after_gc
// VMOptions=--verify_before_gc --verify_after_gc
// VMOptions=--verify_store_buffer
// VMOptions=--verify_after_marking
// VMOptions=--stress_write_barrier_elimination
// VMOptions=--old_gen_heap_size=100
// VMOptions=--mark_when_idle
// VMOptions=--no_load_cse
// VMOptions=--no_dead_store_elimination
// VMOptions=--no_load_cse --no_dead_store_elimination
// VMOptions=--test_il_serialization
// VMOptions=--profiler --no_concurrent_mark --no_concurrent_sweep
// VMOptions=--profiler --no_concurrent_mark --concurrent_sweep
// VMOptions=--profiler --no_concurrent_mark --use_compactor
// VMOptions=--profiler --no_concurrent_mark --use_compactor --force_evacuation
// VMOptions=--profiler --concurrent_mark --no_concurrent_sweep
// VMOptions=--profiler --concurrent_mark --concurrent_sweep
// VMOptions=--profiler --concurrent_mark --use_compactor
// VMOptions=--profiler --concurrent_mark --use_compactor --force_evacuation
// VMOptions=--profiler --scavenger_tasks=0
// VMOptions=--profiler --scavenger_tasks=1
// VMOptions=--profiler --scavenger_tasks=2
// VMOptions=--profiler --scavenger_tasks=3
// VMOptions=--profiler --verify_before_gc
// VMOptions=--profiler --verify_after_gc
// VMOptions=--profiler --verify_before_gc --verify_after_gc
// VMOptions=--profiler --verify_store_buffer
// VMOptions=--profiler --verify_after_marking
// VMOptions=--profiler --stress_write_barrier_elimination
// VMOptions=--profiler --old_gen_heap_size=100
// VMOptions=--profiler --mark_when_idle
// VMOptions=--profiler --no_load_cse
// VMOptions=--profiler --no_dead_store_elimination
// VMOptions=--profiler --no_load_cse --no_dead_store_elimination
// VMOptions=--profiler --test_il_serialization

import "splay_common.dart";

Expand Down
48 changes: 24 additions & 24 deletions runtime/tests/vm/dart_2/splay_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@
// @dart=2.9

// VMOptions=
// VMOptions=--no_concurrent_mark --no_concurrent_sweep
// VMOptions=--no_concurrent_mark --concurrent_sweep
// VMOptions=--no_concurrent_mark --use_compactor
// VMOptions=--no_concurrent_mark --use_compactor --force_evacuation
// VMOptions=--concurrent_mark --no_concurrent_sweep
// VMOptions=--concurrent_mark --concurrent_sweep
// VMOptions=--concurrent_mark --use_compactor
// VMOptions=--concurrent_mark --use_compactor --force_evacuation
// VMOptions=--scavenger_tasks=0
// VMOptions=--scavenger_tasks=1
// VMOptions=--scavenger_tasks=2
// VMOptions=--scavenger_tasks=3
// VMOptions=--verify_before_gc
// VMOptions=--verify_after_gc
// VMOptions=--verify_before_gc --verify_after_gc
// VMOptions=--verify_store_buffer
// VMOptions=--verify_after_marking
// VMOptions=--stress_write_barrier_elimination
// VMOptions=--old_gen_heap_size=100
// VMOptions=--mark_when_idle
// VMOptions=--no_load_cse
// VMOptions=--no_dead_store_elimination
// VMOptions=--no_load_cse --no_dead_store_elimination
// VMOptions=--test_il_serialization
// VMOptions=--profiler --no_concurrent_mark --no_concurrent_sweep
// VMOptions=--profiler --no_concurrent_mark --concurrent_sweep
// VMOptions=--profiler --no_concurrent_mark --use_compactor
// VMOptions=--profiler --no_concurrent_mark --use_compactor --force_evacuation
// VMOptions=--profiler --concurrent_mark --no_concurrent_sweep
// VMOptions=--profiler --concurrent_mark --concurrent_sweep
// VMOptions=--profiler --concurrent_mark --use_compactor
// VMOptions=--profiler --concurrent_mark --use_compactor --force_evacuation
// VMOptions=--profiler --scavenger_tasks=0
// VMOptions=--profiler --scavenger_tasks=1
// VMOptions=--profiler --scavenger_tasks=2
// VMOptions=--profiler --scavenger_tasks=3
// VMOptions=--profiler --verify_before_gc
// VMOptions=--profiler --verify_after_gc
// VMOptions=--profiler --verify_before_gc --verify_after_gc
// VMOptions=--profiler --verify_store_buffer
// VMOptions=--profiler --verify_after_marking
// VMOptions=--profiler --stress_write_barrier_elimination
// VMOptions=--profiler --old_gen_heap_size=100
// VMOptions=--profiler --mark_when_idle
// VMOptions=--profiler --no_load_cse
// VMOptions=--profiler --no_dead_store_elimination
// VMOptions=--profiler --no_load_cse --no_dead_store_elimination
// VMOptions=--profiler --test_il_serialization

import "splay_common.dart";

Expand Down
2 changes: 0 additions & 2 deletions runtime/vm/heap/pages.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1206,10 +1206,8 @@ void PageSpace::ConcurrentSweep(IsolateGroup* isolate_group) {
}

void PageSpace::Compact(Thread* thread) {
thread->isolate_group()->set_compaction_in_progress(true);
GCCompactor compactor(thread, heap_);
compactor.Compact(pages_, &freelists_[Page::kData], &pages_lock_);
thread->isolate_group()->set_compaction_in_progress(false);

if (FLAG_verify_after_gc) {
OS::PrintErr("Verifying after compacting...");
Expand Down
9 changes: 0 additions & 9 deletions runtime/vm/isolate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,14 +753,6 @@ class IsolateGroup : public IntrusiveDListEntry<IsolateGroup> {
void VisitObjectIdRingPointers(ObjectPointerVisitor* visitor);
void VisitWeakPersistentHandles(HandleVisitor* visitor);

bool compaction_in_progress() const {
return CompactionInProgressBit::decode(isolate_group_flags_);
}
void set_compaction_in_progress(bool value) {
isolate_group_flags_ =
CompactionInProgressBit::update(value, isolate_group_flags_);
}

// In precompilation we finalize all regular classes before compiling.
bool all_classes_finalized() const {
return AllClassesFinalizedBit::decode(isolate_group_flags_);
Expand Down Expand Up @@ -807,7 +799,6 @@ class IsolateGroup : public IntrusiveDListEntry<IsolateGroup> {

#define ISOLATE_GROUP_FLAG_BITS(V) \
V(AllClassesFinalized) \
V(CompactionInProgress) \
V(EnableAsserts) \
V(HasAttemptedReload) \
V(NullSafety) \
Expand Down
1 change: 0 additions & 1 deletion runtime/vm/object.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12933,7 +12933,6 @@ ClassPtr Object::clazz() const {
if ((raw_value & kSmiTagMask) == kSmiTag) {
return Smi::Class();
}
ASSERT(!IsolateGroup::Current()->compaction_in_progress());
return IsolateGroup::Current()->class_table()->At(ptr()->GetClassId());
}

Expand Down
57 changes: 0 additions & 57 deletions runtime/vm/profiler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,33 +377,6 @@ static bool GetAndValidateThreadStackBounds(OSThread* os_thread,
return ValidateThreadStackBounds(fp, sp, *stack_lower, *stack_upper);
}

// Some simple sanity checking of |fp|, and |sp|.
static bool InitialStackRegistersCheck(uintptr_t fp, uintptr_t sp) {
if ((sp == 0) || (fp == 0)) {
// None of these registers should be zero.
return false;
}

if (sp > fp) {
// Assuming the stack grows down, we should never have a stack pointer above
// the frame pointer.
return false;
}

return true;
}

#if !defined(PRODUCT)
// Some simple sanity checking of |pc|, |fp|, and |sp|.
static bool InitialRegisterCheck(uintptr_t pc, uintptr_t fp, uintptr_t sp) {
if (pc == 0) {
return false;
}

return InitialStackRegistersCheck(fp, sp);
}
#endif // !defined(PRODUCT)

void Profiler::DumpStackTrace(void* context) {
if (context == NULL) {
DumpStackTrace(/*for_crash=*/true);
Expand Down Expand Up @@ -518,16 +491,6 @@ void Profiler::DumpStackTrace(uword sp, uword fp, uword pc, bool for_crash) {
: reinterpret_cast<uword>(vm_source->snapshot_instructions));
OS::PrintErr("fp=%" Px ", sp=%" Px ", pc=%" Px "\n", fp, sp, pc);

if (!InitialStackRegistersCheck(fp, sp)) {
OS::PrintErr(
"Stack dump aborted because InitialStackRegistersCheck failed.\n");
if (pc != 0) { // At the very least dump the top frame.
DumpStackFrame(0, pc, fp);
}
DumpCompilerState(thread);
return;
}

uword stack_lower = 0;
uword stack_upper = 0;
if (!GetAndValidateThreadStackBounds(os_thread, thread, fp, sp, &stack_lower,
Expand Down Expand Up @@ -1395,10 +1358,6 @@ void Profiler::SampleAllocation(Thread* thread,
uword stack_lower = 0;
uword stack_upper = 0;

if (!InitialRegisterCheck(pc, fp, sp)) {
return;
}

if (!GetAndValidateThreadStackBounds(os_thread, thread, fp, sp, &stack_lower,
&stack_upper)) {
// Could not get stack boundary.
Expand Down Expand Up @@ -1449,11 +1408,6 @@ Sample* Profiler::SampleNativeAllocation(intptr_t skip_count,

uword stack_lower = 0;
uword stack_upper = 0;
if (!InitialRegisterCheck(pc, fp, sp)) {
counters_.failure_native_allocation_sample.fetch_add(1);
return NULL;
}

if (!(OSThread::GetCurrentStackBounds(&stack_lower, &stack_upper) &&
ValidateThreadStackBounds(fp, sp, stack_lower, stack_upper))) {
// Could not get stack boundary.
Expand Down Expand Up @@ -1579,17 +1533,6 @@ void Profiler::SampleThread(Thread* thread,
SampleThreadSingleFrame(thread, sample, pc);
return;
}
if (isolate->group()->compaction_in_progress()) {
// The Dart stack isn't fully walkable.
SampleThreadSingleFrame(thread, sample, pc);
return;
}
}

if (!InitialRegisterCheck(pc, fp, sp)) {
counters_.single_frame_sample_register_check.fetch_add(1);
SampleThreadSingleFrame(thread, sample, pc);
return;
}

uword stack_lower = 0;
Expand Down
1 change: 0 additions & 1 deletion runtime/vm/profiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class ProfileTrieNode;
V(bail_out_jump_to_exception_handler) \
V(bail_out_check_isolate) \
V(single_frame_sample_deoptimizing) \
V(single_frame_sample_register_check) \
V(single_frame_sample_get_and_validate_stack_bounds) \
V(stack_walker_native) \
V(stack_walker_dart_exit) \
Expand Down
2 changes: 0 additions & 2 deletions runtime/vm/profiler_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,6 @@ void Profile::PrintHeaderJSON(JSONObject* obj) {
counters.bail_out_check_isolate);
counts.AddProperty64("single_frame_sample_deoptimizing",
counters.single_frame_sample_deoptimizing);
counts.AddProperty64("single_frame_sample_register_check",
counters.single_frame_sample_register_check);
counts.AddProperty64(
"single_frame_sample_get_and_validate_stack_bounds",
counters.single_frame_sample_get_and_validate_stack_bounds);
Expand Down
1 change: 0 additions & 1 deletion tests/language/class_modifiers/mixin/mixin_class_generative_constructor_error_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ mixin class MixinClassExternal {
external MixinClassExternal();
// ^^^^^^^^^^^^^^^^^^
// [analyzer] COMPILE_TIME_ERROR.MIXIN_CLASS_DECLARES_CONSTRUCTOR
// [web] Only JS interop members may be 'external'.
}

mixin class MixinClassSuper {
Expand Down
2 changes: 1 addition & 1 deletion tools/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ CHANNEL dev
MAJOR 3
MINOR 0
PATCH 0
PRERELEASE 269
PRERELEASE 270
PRERELEASE_PATCH 0

0 comments on commit a101430

Please sign in to comment.