From: Russ Cox <rsc@golang.org>
Date: Fri, 9 Aug 2013 01:06:06 +0000 (-0400)
Subject: cmd/cc: restore correct meaning of %Q
X-Git-Tag: go1.2rc2~705
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=237e7c134c948c3a4c6c9aa84b5b8dd7192af919;p=gostls13.git

cmd/cc: restore correct meaning of %Q

g% 6c ~/x.c
/Users/rsc/x.c:1 duplicate types given: STRUCT s and VOID
/Users/rsc/x.c:1 no return at end of function: f
g%

Fixes #6083.

R=ken2
CC=golang-dev
https://golang.org/cl/12691043
---

diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c
index b46c368b58..d1aa2e483b 100644
--- a/src/cmd/cc/lex.c
+++ b/src/cmd/cc/lex.c
@@ -118,6 +118,7 @@ main(int argc, char *argv[])
 {
 	int c;
 
+	quotefmtinstall(); // before cinit, which overrides %Q
 	ensuresymb(NSYMB);
 	memset(debug, 0, sizeof(debug));
 	tinit();
@@ -126,7 +127,6 @@ main(int argc, char *argv[])
 	arginit();
 	
 	fmtstrinit(&pragcgobuf);
-	quotefmtinstall();
 
 	tufield = simplet((1L<<tfield->etype) | BUNSIGNED);
 	ndef = 0;