Merge pull request golang#4 from 4ad/checknil-non-reg

davecheney · davecheney · commit fb718ae0bf6d · 2014-12-12T11:30:42.000+11:00
cmd/gc: support checknil on non-reg operands on arm64
diff --git a/src/cmd/gc/pgen.c b/src/cmd/gc/pgen.c
@@ -528,7 +528,7 @@ cgen_checknil(Node *n)
 		dump("checknil", n);
 		fatal("bad checknil");
 	}
-	if(((thechar == '5' || thechar == '9') && n->op != OREGISTER) || !n->addable || n->op == OLITERAL) {
+	if(((thechar == '5' || thechar == '7' || thechar == '9') && n->op != OREGISTER) || !n->addable || n->op == OLITERAL) {
 		regalloc(&reg, types[tptr], n);
 		cgen(n, &reg);
 		gins(ACHECKNIL, &reg, N);

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ cgen_checknil(Node *n)`
`528`	`528`	`dump("checknil", n);`
`529`	`529`	`fatal("bad checknil");`
`530`	`530`	`}`
`531`		`- if(((thechar == '5' \|\| thechar == '9') && n->op != OREGISTER) \|\| !n->addable \|\| n->op == OLITERAL) {`
	`531`	`+ if(((thechar == '5' \|\| thechar == '7' \|\| thechar == '9') && n->op != OREGISTER) \|\| !n->addable \|\| n->op == OLITERAL) {`
`532`	`532`	`regalloc(&reg, types[tptr], n);`
`533`	`533`	`cgen(n, &reg);`
`534`	`534`	`gins(ACHECKNIL, &reg, N);`