diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
| commit | 78db2eb9c66d478bee0d56edcc55d4f865f8c6c7 (patch) | |
| tree | d08da7ddd82570422ae87dc9d3ac061f8ce3b648 /src/cmd/gc/racewalk.c | |
| parent | af64ab79c0ad72decf083d78cf54257d009741b5 (diff) | |
| parent | 25c63c2c30f4807b073f849d248144d97893ce70 (diff) | |
| download | go-78db2eb9c66d478bee0d56edcc55d4f865f8c6c7.tar.gz | |
all: merge default branch into dev.garbage
hg was unable to create a CL on the code review server for this,
so I am submitting the merge by hand.
The only manual edits are in mgc0.c, to reapply the
removal of cached/ncached to the new code.
Diffstat (limited to 'src/cmd/gc/racewalk.c')
| -rw-r--r-- | src/cmd/gc/racewalk.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/cmd/gc/racewalk.c b/src/cmd/gc/racewalk.c index cb98ca247..c9e27fe56 100644 --- a/src/cmd/gc/racewalk.c +++ b/src/cmd/gc/racewalk.c @@ -210,12 +210,7 @@ racewalknode(Node **np, NodeList **init, int wr, int skip) 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)) { + if(n->left->sym != S && n->left->sym->pkg == runtimepkg && strncmp(n->left->sym->name, "writebarrier", 12) == 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) { |