code review 56060043: undo CL 45770044 / d795425bfa18

src/pkg/runtime/malloc.goc

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // See malloc.h for overview.
 //
 // TODO(rsc): double-check stats.
 
 package runtime
 #include "runtime.h"
 #include "arch_GOARCH.h"
 #include "malloc.h"
 #include "type.h"
 #include "typekind.h"
 #include "race.h"
 #include "stack.h"
 #include "../../cmd/ld/textflag.h"
 
 // Mark mheap as 'no pointers', it does not contain interesting pointers but occupies ~45K.
 #pragma dataflag NOPTR
 MHeap runtime·mheap;
-MStats mstats;
 
 int32   runtime·checking;
 
 extern MStats mstats;   // defined in zruntime_def_$GOOS_$GOARCH.go
 
 extern volatile intgo runtime·MemProfileRate;
 
 // Allocate an object of at least size bytes.
 // Small objects are allocated from the per-thread cache's free lists.
 // Large objects (> 32 kB) are allocated straight from the heap.
@@ skipping 281 matching lines @@
         h->largefree += c->local_largefree;
         c->local_largefree = 0;
         h->nlargefree += c->local_nlargefree;
         c->local_nlargefree = 0;
         for(i=0; i<nelem(c->local_nsmallfree); i++) {
                 h->nsmallfree[i] += c->local_nsmallfree[i];
                 c->local_nsmallfree[i] = 0;
         }
 }
 
-// Size of the trailing by_size array differs between Go and C,
-// NumSizeClasses was changed, but we can not change Go struct because of backward compatibility.
-// sizeof_C_MStats is what C thinks about size of Go struct.
-uintptr runtime·sizeof_C_MStats = sizeof(MStats) - (NumSizeClasses - 61) * sizeof(mstats.by_size[0]);
+uintptr runtime·sizeof_C_MStats = sizeof(MStats);
 
 #define MaxArena32 (2U<<30)
 
 void
 runtime·mallocinit(void)
 {
         byte *p;
         uintptr arena_size, bitmap_size, spans_size;
         extern byte end[];
         byte *want;
@@ skipping 468 matching lines @@
                 // NOTE: asking to remove a finalizer when there currently isn't one set is OK.
                 runtime·removefinalizer(obj.data);
         }
         return;
 
 badfunc:
         runtime·printf("runtime.SetFinalizer: cannot pass %S to finalizer %S\n", *obj.type->string, *finalizer.type->string);
 throw:
         runtime·throw("runtime.SetFinalizer");
 }