diff options
| author | Dmitriy Vyukov <dvyukov@google.com> | 2012-11-01 22:59:53 +0400 |
|---|---|---|
| committer | Dmitriy Vyukov <dvyukov@google.com> | 2012-11-01 22:59:53 +0400 |
| commit | 936498e5dcd8a329a5da8cd743f60bdb820e6c22 (patch) | |
| tree | 5add19bcf3da0225cd849df1985637ed88354634 /src | |
| parent | de10a23db14106588b608d724510849c4e5f278a (diff) | |
| download | go-936498e5dcd8a329a5da8cd743f60bdb820e6c22.tar.xz | |
cmd/gc: fix build
R=golang-dev
CC=golang-dev
https://golang.org/cl/6826047
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/gc/racewalk.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/cmd/gc/racewalk.c b/src/cmd/gc/racewalk.c index a09b7adf43..9e942498ba 100644 --- a/src/cmd/gc/racewalk.c +++ b/src/cmd/gc/racewalk.c @@ -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 // getcallerpc. We use -widthptr(FP) for x86. // BUG: this will not work on arm. @@ -58,8 +51,7 @@ racewalk(Node *fn) nodpc->type = types[TUINTPTR]; nodpc->xoffset = -widthptr; nd = mkcall("racefuncenter", T, nil, nodpc); - fn->enter = list(fn->enter, nd); ->>>>>>> other + fn->enter = concat(list1(nd), fn->enter); nd = mkcall("racefuncexit", T, nil); fn->exit = list(fn->exit, nd); racewalklist(curfn->nbody, nil); |