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 b46c368b58a7d81b4d2272faff6a10105b5baa4d..d1aa2e483b4615cd8314edcdf397d373a3d1f9f0 100644 (file)
--- 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;