qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 22:04:44 -07:00
Code Releases Activity

cmd/gc: fix racewalk after writebarrier change

Browse Source 
Instrument dst argument of writebarrier calls.

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/139560045
This commit is contained in:
Dmitriy Vyukov 2014-09-12 15:05:41 -07:00
parent 44753479c6
commit d78823168f
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,31 @@ racewalknode(Node **np, NodeList **init, int wr, int skip)
goto ret; goto ret;
case OCALLFUNC: case OCALLFUNC:
// Instrument dst argument of runtime.writebarrier* calls
// as we do not instrument runtime code.
if(n->left->sym != S && n->left->sym->pkg == runtimepkg &&
(strcmp(n->left->sym->name, "writebarrierptr") == 0 ||
strcmp(n->left->sym->name, "writebarrierstring") == 0 ||
strcmp(n->left->sym->name, "writebarrierslice") == 0 ||
strcmp(n->left->sym->name, "writebarrieriface") == 0 ||
strcmp(n->left->sym->name, "writebarrierfat") == 0)) {
// Find the dst argument.
// The list can be reordered, so it's not necessary just the first or the second element.
for(l = n->list; l; l = l->next) {
if(strcmp(n->left->sym->name, "writebarrierfat") == 0) {
if(l->n->left->xoffset == widthptr)
break;
} else {
if(l->n->left->xoffset == 0)
break;
}
}
if(l == nil)
fatal("racewalk: writebarrier no arg");
if(l->n->right->op != OADDR)
fatal("racewalk: writebarrier bad arg");
callinstr(&l->n->right->left, init, 1, 0);
}
racewalknode(&n->left, init, 0, 0); racewalknode(&n->left, init, 0, 0);
goto ret; goto ret;