diff --git a/src/pkg/runtime/malloc.go b/src/pkg/runtime/malloc.go index 73dc9f20d6..71c0a4ecd7 100644 --- a/src/pkg/runtime/malloc.go +++ b/src/pkg/runtime/malloc.go @@ -11,9 +11,8 @@ import ( const ( debugMalloc = false - flagNoScan = 1 << 0 // GC doesn't have to scan object - flagNoProfiling = 1 << 1 // must not profile - flagNoZero = 1 << 2 // don't zero memory + flagNoScan = 1 << 0 // GC doesn't have to scan object + flagNoZero = 1 << 1 // don't zero memory kindArray = 17 kindFunc = 19 @@ -300,14 +299,12 @@ marked: if debug.allocfreetrace != 0 { tracealloc(x, size, typ) } - if flags&flagNoProfiling == 0 { - rate := MemProfileRate - if rate > 0 { - if size < uintptr(rate) && int32(size) < c.next_sample { - c.next_sample -= int32(size) - } else { - profilealloc(mp, x, size) - } + + if rate := MemProfileRate; rate > 0 { + if size < uintptr(rate) && int32(size) < c.next_sample { + c.next_sample -= int32(size) + } else { + profilealloc(mp, x, size) } } diff --git a/src/pkg/runtime/malloc.h b/src/pkg/runtime/malloc.h index 556d6d4c03..4612dddb16 100644 --- a/src/pkg/runtime/malloc.h +++ b/src/pkg/runtime/malloc.h @@ -534,8 +534,7 @@ enum { // flags to malloc FlagNoScan = 1<<0, // GC doesn't have to scan object - FlagNoProfiling = 1<<1, // must not profile - FlagNoZero = 1<<2, // don't zero memory + FlagNoZero = 1<<1, // don't zero memory }; void runtime·MProf_Malloc(void*, uintptr);