code review 7986043: cmd/gc: instrument logical && and ||.

src/cmd/gc/subr.c

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #include        <u.h>
 #include        <libc.h>
 #include        "go.h"
 #include        "md5.h"
 #include        "y.tab.h"
 #include        "yerr.h"
@@ skipping 1741 matching lines @@
                 ul = 1;
                 if(n->class == PPARAMREF || (n->class & PHEAP))
                         ul++;
                 goto out;
         case OCALL:
         case OCALLFUNC:
         case OCALLMETH:
         case OCALLINTER:
                 ul = UINF;
                 goto out;
+        case OANDAND:
+        case OOROR:
+                // hard with race detector
+                if(flag_race) {
+                        ul = UINF;
+                        goto out;
+                }
         }
         ul = 1;
         if(n->left != N)
                 ul = n->left->ullman;
         ur = 1;
         if(n->right != N)
                 ur = n->right->ullman;
         if(ul == ur)
                 ul += 1;
         if(ur > ul)
@@ skipping 1958 matching lines @@
         Node *n;
 ········
         if(isinter(x->type)) {
                 x = nod(OITAB, x, N);
                 typecheck(&x, Erv);
         }
         n = nod(OCHECKNOTNIL, x, N);
         n->typecheck = 1;
         *init = list(*init, n);
 }