Commit c0e0f82e authored by Rob Pike's avatar Rob Pike

better code for allocation through indirection

R=rsc
DELTA=11  (3 added, 5 deleted, 3 changed)
OCL=35583
CL=35583
parent 330ab5fd
......@@ -355,18 +355,16 @@ type decEngine struct {
}
func decodeStruct(engine *decEngine, rtyp *reflect.StructType, b *bytes.Buffer, p uintptr, indir int) os.Error {
for ; indir > 0; indir-- {
if indir > 0 {
up := unsafe.Pointer(p);
if indir > 1 {
up = decIndirect(up, indir)
}
if *(*unsafe.Pointer)(up) == nil {
// Allocate object by making a slice of bytes and recording the
// address of the beginning of the array. TODO(rsc).
if indir > 1 { // allocate a pointer
b := make([]byte, unsafe.Sizeof((*int)(nil)));
*(*unsafe.Pointer)(up) = unsafe.Pointer(&b[0]);
} else { // allocate a struct
b := make([]byte, rtyp.Size());
*(*unsafe.Pointer)(up) = unsafe.Pointer(&b[0]);
}
b := make([]byte, rtyp.Size());
*(*unsafe.Pointer)(up) = unsafe.Pointer(&b[0]);
}
p = *(*uintptr)(up);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment