Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: runtime/vm/stub_code_x64.cc

Issue 1292723002: Enable allocation tracing for classes owned by vm isolate (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/stub_code_mips.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_x64.cc
diff --git a/runtime/vm/stub_code_x64.cc b/runtime/vm/stub_code_x64.cc
index 4fe0d9bc63dce897a7220b1ce6a9ad07ba1c88b4..d7793d2a34d0e18f63e01a516309ce6f2ec465aa 100644
--- a/runtime/vm/stub_code_x64.cc
+++ b/runtime/vm/stub_code_x64.cc
@@ -593,7 +593,7 @@ void StubCode::GenerateAllocateArrayStub(Assembler* assembler) {
// Check for allocation tracing.
__ MaybeTraceAllocation(kArrayCid,
&slow_case,
- /* near_jump = */ false,
+ Assembler::kFarJump,
/* inline_isolate = */ false);
const intptr_t fixed_size = sizeof(RawArray) + kObjectAlignment - 1;
@@ -848,6 +848,12 @@ void StubCode::GenerateAllocateContextStub(Assembler* assembler) {
__ leaq(R13, Address(R10, TIMES_8, fixed_size));
__ andq(R13, Immediate(-kObjectAlignment));
+ // Check for allocation tracing.
+ __ MaybeTraceAllocation(kContextCid,
+ &slow_case,
+ Assembler::kFarJump,
+ /* inline_isolate = */ false);
+
// Now allocate the object.
// R10: number of context variables.
const intptr_t cid = kContextCid;
@@ -1054,8 +1060,9 @@ void StubCode::GenerateAllocationStubForClass(
__ movq(RDX, Address(RSP, kObjectTypeArgumentsOffset));
// RDX: instantiated type arguments.
}
+ Isolate* isolate = Isolate::Current();
if (FLAG_inline_alloc && Heap::IsAllocatableInNewSpace(instance_size) &&
- !cls.trace_allocation()) {
+ !cls.TraceAllocation(isolate)) {
Label slow_case;
// Allocate the object and update top to point to
// next object start and initialize the allocated object.
« no previous file with comments | « runtime/vm/stub_code_mips.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698