qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 05:34:40 -07:00
Code Releases Activity

cmd/gc: fix build

Browse Source 
R=golang-dev
CC=golang-dev
https://golang.org/cl/6826047
This commit is contained in:
Dmitriy Vyukov 2012-11-01 22:59:53 +04:00
parent de10a23db1
commit 936498e5dc
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/gc/racewalk.c
View File

@ -43,13 +43,6 @@ racewalk(Node *fn)
} }
} }
<<<<<<< local
// TODO(dvyukov): ideally this should be:
// racefuncenter(getreturnaddress())
// because it's much more costly to obtain from runtime library.
nd = mkcall("racefuncenter", T, nil);
fn->enter = concat(list1(nd), fn->enter);
=======
// nodpc is the PC of the caller as extracted by // nodpc is the PC of the caller as extracted by
// getcallerpc. We use -widthptr(FP) for x86. // getcallerpc. We use -widthptr(FP) for x86.
// BUG: this will not work on arm. // BUG: this will not work on arm.
@ -58,8 +51,7 @@ racewalk(Node *fn)
nodpc->type = types[TUINTPTR]; nodpc->type = types[TUINTPTR];
nodpc->xoffset = -widthptr; nodpc->xoffset = -widthptr;
nd = mkcall("racefuncenter", T, nil, nodpc); nd = mkcall("racefuncenter", T, nil, nodpc);
fn->enter = list(fn->enter, nd); fn->enter = concat(list1(nd), fn->enter);
>>>>>>> other
nd = mkcall("racefuncexit", T, nil); nd = mkcall("racefuncexit", T, nil);
fn->exit = list(fn->exit, nd); fn->exit = list(fn->exit, nd);
racewalklist(curfn->nbody, nil); racewalklist(curfn->nbody, nil);