diff options
| author | Luuk van Dijk <lvd@golang.org> | 2011-12-01 14:46:32 +0100 |
|---|---|---|
| committer | Luuk van Dijk <lvd@golang.org> | 2011-12-01 14:46:32 +0100 |
| commit | 6bee4e556fddec07cbdeb348dd91d3e55f7e2960 (patch) | |
| tree | 5885cb4f4dcf4647fdee0e41533df8ea1bcef327 | |
| parent | c4d0ac0e2f7a12cf44f4711b47bbc5737c14ce9c (diff) | |
| download | go-6bee4e556fddec07cbdeb348dd91d3e55f7e2960.tar.gz go-6bee4e556fddec07cbdeb348dd91d3e55f7e2960.zip | |
gc: avoid re-genning ninit in branches involving float comparison.
R=rsc
CC=golang-dev
https://golang.org/cl/5451050
| -rw-r--r-- | src/cmd/5g/cgen.c | 4 | ||||
| -rw-r--r-- | src/cmd/6g/cgen.c | 4 | ||||
| -rw-r--r-- | src/cmd/8g/cgen.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c index 15defaf111..0616cd3668 100644 --- a/src/cmd/5g/cgen.c +++ b/src/cmd/5g/cgen.c @@ -850,6 +850,7 @@ bgen(Node *n, int true, Prog *to) int et, a; Node *nl, *nr, *r; Node n1, n2, n3, n4, tmp; + NodeList *ll; Prog *p1, *p2; USED(n4); // in unreachable code below @@ -950,7 +951,10 @@ bgen(Node *n, int true, Prog *to) p1 = gbranch(AB, T); p2 = gbranch(AB, T); patch(p1, pc); + ll = n->ninit; + n->ninit = nil; bgen(n, 1, p2); + n->ninit = ll; patch(gbranch(AB, T), to); patch(p2, pc); goto ret; diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c index 43bec00594..308915f64d 100644 --- a/src/cmd/6g/cgen.c +++ b/src/cmd/6g/cgen.c @@ -717,6 +717,7 @@ bgen(Node *n, int true, Prog *to) int et, a; Node *nl, *nr, *l, *r; Node n1, n2, tmp; + NodeList *ll; Prog *p1, *p2; if(debug['g']) { @@ -834,7 +835,10 @@ bgen(Node *n, int true, Prog *to) p1 = gbranch(AJMP, T); p2 = gbranch(AJMP, T); patch(p1, pc); + ll = n->ninit; // avoid re-genning ninit + n->ninit = nil; bgen(n, 1, p2); + n->ninit = ll; patch(gbranch(AJMP, T), to); patch(p2, pc); goto ret; diff --git a/src/cmd/8g/cgen.c b/src/cmd/8g/cgen.c index 21b7815fd4..cf1eacde57 100644 --- a/src/cmd/8g/cgen.c +++ b/src/cmd/8g/cgen.c @@ -787,6 +787,7 @@ bgen(Node *n, int true, Prog *to) int et, a; Node *nl, *nr, *r; Node n1, n2, tmp, t1, t2, ax; + NodeList *ll; Prog *p1, *p2; if(debug['g']) { @@ -902,7 +903,10 @@ bgen(Node *n, int true, Prog *to) p1 = gbranch(AJMP, T); p2 = gbranch(AJMP, T); patch(p1, pc); + ll = n->ninit; // avoid re-genning ninit + n->ninit = nil; bgen(n, 1, p2); + n->ninit = ll; patch(gbranch(AJMP, T), to); patch(p2, pc); break; |