[vm/isolates] Clean up redundant SafepointOperationScope when installing allocation stub.

aam · commit-bot@chromium.org · commit 8b9f920c52bd · 2020-07-08T19:47:36.000Z
The SafepointOperationScope is provided by RunWithStoppedMutators. Change-Id: Ib0f3a86de58b074a0b5b84b05631ecc59d62de36 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153640 Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Alexander Aprelev <aam@google.com>
diff --git a/runtime/vm/compiler/jit/compiler.cc b/runtime/vm/compiler/jit/compiler.cc
@@ -659,7 +659,7 @@ CodePtr CompileParsedFunctionHelper::Compile(CompilationPipeline* pipeline) {
         //      those writes are observed atomically.
         //
         thread()->isolate_group()->RunWithStoppedMutators(
-            install_code_fun, install_code_fun, /*use_force_growth=*/true);
+            install_code_fun, /*use_force_growth=*/true);
       }
       if (!result->IsNull()) {
         // Must be called outside of safepoint.
diff --git a/runtime/vm/stub_code.cc b/runtime/vm/stub_code.cc
@@ -220,7 +220,7 @@ CodePtr StubCode::GetAllocationStubForClass(const Class& cls) {
       }
     };
     auto bg_compiler_fun = [&]() {
-      ForceGrowthSafepointOperationScope safepoint_scope(thread);
+      ASSERT(Thread::Current()->IsAtSafepoint());
       stub = cls.allocation_stub();
       // Check if stub was already generated.
       if (!stub.IsNull()) {
diff --git a/runtime/vm/type_testing_stubs.cc b/runtime/vm/type_testing_stubs.cc
@@ -226,8 +226,8 @@ CodePtr TypeTestingStubGenerator::BuildCodeForType(const Type& type) {
   //   a) We allocate an instructions object, which might cause us to
   //      temporarily flip page protections from (RX -> RW -> RX).
   //
-  thread->isolate_group()->RunWithStoppedMutators(
-      install_code_fun, install_code_fun, /*use_force_growth=*/true);
+  thread->isolate_group()->RunWithStoppedMutators(install_code_fun,
+                                                  /*use_force_growth=*/true);
 
   Code::NotifyCodeObservers(name, code, /*optimized=*/false);
 

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ CodePtr CompileParsedFunctionHelper::Compile(CompilationPipeline* pipeline) {`
`659`	`659`	`// those writes are observed atomically.`
`660`	`660`	`//`
`661`	`661`	`thread()->isolate_group()->RunWithStoppedMutators(`
`662`		`- install_code_fun, install_code_fun, /use_force_growth=/true);`
	`662`	`+ install_code_fun, /use_force_growth=/true);`
`663`	`663`	`}`
`664`	`664`	`if (!result->IsNull()) {`
`665`	`665`	`// Must be called outside of safepoint.`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ CodePtr StubCode::GetAllocationStubForClass(const Class& cls) {`
`220`	`220`	`}`
`221`	`221`	`};`
`222`	`222`	`auto bg_compiler_fun = [&]() {`
`223`		`- ForceGrowthSafepointOperationScope safepoint_scope(thread);`
	`223`	`+ ASSERT(Thread::Current()->IsAtSafepoint());`
`224`	`224`	`stub = cls.allocation_stub();`
`225`	`225`	`// Check if stub was already generated.`
`226`	`226`	`if (!stub.IsNull()) {`