From b2ad0b1054d83026ef0d0f0fc840eb543a4d0e2b Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 4 Aug 2016 17:21:23 +0000 Subject: [PATCH] runtime: fix incorrectly commented out code in heapdump.c Reviewed-on: https://go-review.googlesource.com/25490 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239144 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/heapdump.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 92cb99aae70..83a187cf68c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -235dffb0de1e99d6f521f052067f0e936bf63baa +ae44ca35b0b1c2ab925cadbcd7d47b334be5a318 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/heapdump.c b/libgo/runtime/heapdump.c index d0cfb01478d..52a91e87da7 100644 --- a/libgo/runtime/heapdump.c +++ b/libgo/runtime/heapdump.c @@ -763,14 +763,16 @@ dumpefacetypes(void *obj __attribute__ ((unused)), uintptr size, const Type *typ //playgcprog(0, (uintptr*)type->gc + 1, dumpeface_callback, obj); break; case TypeInfo_Array: - for(i = 0; i <= size - type->__size; i += type->__size) + for(i = 0; i <= size - type->__size; i += type->__size) { //playgcprog(i, (uintptr*)type->gc + 1, dumpeface_callback, obj); + } break; case TypeInfo_Chan: if(type->__size == 0) // channels may have zero-sized objects in them break; - for(i = runtime_Hchansize; i <= size - type->__size; i += type->__size) + for(i = runtime_Hchansize; i <= size - type->__size; i += type->__size) { //playgcprog(i, (uintptr*)type->gc + 1, dumpeface_callback, obj); + } break; } } -- 2.11.4.GIT