From c1e8c57c3d0083fafaf451db7b9b018e16d3669b Mon Sep 17 00:00:00 2001
From: Austin Clements <austin@google.com>
Date: Wed, 12 Nov 2014 14:16:49 -0500
Subject: [dev.power64] 9g: fix width check and width calculation for OADDR

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/174970043
---
 src/cmd/9g/gsubr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cmd/9g/gsubr.c b/src/cmd/9g/gsubr.c
index f7a4290818..e5cd5ed4bf 100644
--- a/src/cmd/9g/gsubr.c
+++ b/src/cmd/9g/gsubr.c
@@ -1046,6 +1046,8 @@ gins(int as, Node *f, Node *t)
 		break;
 	case AMOVD:
 	case AMOVDU:
+		if(af.type == D_CONST)
+			break;
 		w = 8;
 		break;
 	}
@@ -1275,7 +1277,6 @@ naddr(Node *n, Addr *a, int canemitcode)
 	case OADDR:
 		naddr(n->left, a, canemitcode);
 		a->etype = tptr;
-		a->width = widthptr;
 		switch(a->type) {
 		case D_OREG:
 			a->type = D_CONST;
-- 
cgit v1.2.3-54-g00ecf