aboutsummaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2015-05-11 16:19:23 +0000
committerIan Lance Taylor <iant@google.com>2015-05-11 16:19:23 +0000
commit5c8476e8fc25c20b736570c34cf97474d0b998d2 (patch)
treeca2076085cadde84d093d695ed2994a6c60704dd /libgo
parent2b66d1714e095ab444da1f9cda1e0a017a07d519 (diff)
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. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@223006 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rw-r--r--libgo/runtime/malloc.goc6
1 files 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;