From b1b0e90567f461bcd76511ffbaacd3f91f3c8c9b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 May 2015 16:19:23 +0000 Subject: [PATCH] runtime: Fix runtime/pprof test when libgo is not optimized. When libgo is not optimized the static function profilealloc in malloc.goc shows up in the stack trace. Rename it to runtime_profilealloc so that runtime/pprof.printStackRecord ignores it. From-SVN: r223006 --- libgo/runtime/malloc.goc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libgo/runtime/malloc.goc b/libgo/runtime/malloc.goc index 43323e25874..473879c3da4 100644 --- a/libgo/runtime/malloc.goc +++ b/libgo/runtime/malloc.goc @@ -64,7 +64,7 @@ extern volatile intgo runtime_MemProfileRate __asm__ (GOSYM_PREFIX "runtime.MemProfileRate"); static MSpan* largealloc(uint32, uintptr*); -static void profilealloc(void *v, uintptr size); +static void runtime_profilealloc(void *v, uintptr size); static void settype(MSpan *s, void *v, uintptr typ); // Allocate an object of at least size bytes. @@ -250,7 +250,7 @@ runtime_mallocgc(uintptr size, uintptr typ, uint32 flag) if(size < (uintptr)rate && size < (uintptr)(uint32)c->next_sample) c->next_sample -= size; else - profilealloc(v, size); + runtime_profilealloc(v, size); } m->locks--; @@ -290,7 +290,7 @@ largealloc(uint32 flag, uintptr *sizep) } static void -profilealloc(void *v, uintptr size) +runtime_profilealloc(void *v, uintptr size) { uintptr rate; int32 next; -- 2.30.2