From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jorgen.kvalsvik@woven-planet.global>
Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132])
	by sourceware.org (Postfix) with ESMTPS id AD3083857B9B
	for <gcc-patches@gcc.gnu.org>; Tue, 11 Oct 2022 12:43:21 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AD3083857B9B
Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=woven-planet.global
Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=woven-planet.global
Received: by mail-lf1-x132.google.com with SMTP id g1so20878647lfu.12
        for <gcc-patches@gcc.gnu.org>; Tue, 11 Oct 2022 05:43:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=woven-planet.global; s=google;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:cc:to:from:from:to:cc:subject:date
         :message-id:reply-to;
        bh=OLmcPUVg+oWcBBp9yrPzue68aiIJCmFjEO/LAN4NZiU=;
        b=RE89szE2n4SJ7mtyjovn/5PhJcCIdGG029LguA0xsnQfWJ45Y2YUHYZbfxPxkRaRju
         mLa13fhBIWV0zvSbdXiIXIf9h+WhveKIQqr5Tr2mmLfIDqRYYI8qn7/BA+LPw/Tp0fBs
         1V5qQ9XP0D+wVq3jIQKRuzGs0+VGDZtKxL64Q=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
         :subject:date:message-id:reply-to;
        bh=OLmcPUVg+oWcBBp9yrPzue68aiIJCmFjEO/LAN4NZiU=;
        b=kCeonymRwiNukX+LtMp0GROKeZSB1LxWtOM74/m0u/x1v2v6qcY5g3N5mMmFvYy8NH
         7WeNVW7CZHVPr9XYtoEddaswPQ92UP9aHHHNZtdltl0+2R0LXUoJcQHEwA28gj3mc/71
         YuEEPwdU0+5GDGYJQIVkYQfK3m9ZQClxSu9pXlc5T/2vzqXfn6OV4AMPF5fccA4oOGj9
         1iddQCp6Nf/JauzbetP0sWBwwkCP/aBwwVUQlxYeAq1EP2ngr1rVSrZ7T3WYFQZcftS7
         H41yluglh75ct+/rqLYHsoJw8hZA69CJSq9bDkUR34vXE4LKEvmnW82DfuoFXQ1USLh1
         Q9XA==
X-Gm-Message-State: ACrzQf171IGUAdZa2skdGcXKljkG1u2+880oCVXi+YJYMB++eNCIjkVn
	XzIw3Y8jTOWU3tgAlR19pQjg7c5+8sEu0HWNxTwn5OiKxJvKGWucPU8oCiJACZqYhGWIijmlW59
	FjoculciPbWQkamJsOx1vxpXiZdcnMx7HfaO3nzh72u7UQrc7MnUcYNa0JaT0gGlMTFWQnV0ECY
	PkfrNrBYV+EXu4RkdFSN8=
X-Google-Smtp-Source: AMsMyM53zIUm8BJMzEJSJ2G/qHcl1EZ5mwypLMN9fFdrhqlZBHqBeorAOyWUoc2YNwyTp8YdXJO+cQ==
X-Received: by 2002:a05:6512:693:b0:4a2:a7f4:5fc5 with SMTP id t19-20020a056512069300b004a2a7f45fc5mr7407792lfe.43.1665492199951;
        Tue, 11 Oct 2022 05:43:19 -0700 (PDT)
Received: from localhost.localdomain ([2a02:2121:6ca:a542:1c10:1c18:418e:cd9d])
        by smtp.gmail.com with ESMTPSA id p9-20020a2eb7c9000000b00262fae1ffe6sm2131060ljo.110.2022.10.11.05.43.18
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 11 Oct 2022 05:43:19 -0700 (PDT)
From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= <jorgen.kvalsvik@woven-planet.global>
To: gcc-patches@gcc.gnu.org
Cc: richard.guenther@gmail.com,
	mliska@suse.cz,
	=?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= <jorgen.kvalsvik@woven-planet.global>
Subject: [PATCH 2/2] gcov: test line count for label in then/else block
Date: Tue, 11 Oct 2022 14:43:03 +0200
Message-Id: <20221011124303.99673-2-jorgen.kvalsvik@woven-planet.global>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20221011124303.99673-1-jorgen.kvalsvik@woven-planet.global>
References: <20221011124303.99673-1-jorgen.kvalsvik@woven-planet.global>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,TXREP,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <gcc-patches.gcc.gnu.org>

Add a test to catch regression in line counts for labels on top of
then/else blocks. Only the 'goto <label>' should contribute to the line
counter for the label, not the if.

gcc/testsuite/ChangeLog:

	* gcc.misc-tests/gcov-4.c:
---
 gcc/testsuite/gcc.misc-tests/gcov-4.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.misc-tests/gcov-4.c b/gcc/testsuite/gcc.misc-tests/gcov-4.c
index 498d299b66b..da7929ef7fc 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-4.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-4.c
@@ -110,6 +110,29 @@ lab2:
   return 8;				/* count(1) */
 }
 
+int
+test_goto3 (int i, int j)
+{
+    if (j) goto else_;		/* count(1) */
+
+top:
+    if (i)			/* count(1) */
+      {
+	i = do_something (i);
+      }
+    else
+      {
+else_:				/* count(1) */
+	j = do_something (j);	/* count(2) */
+	if (j)			/* count(2) */
+	  {
+	    j = 0;		/* count(1) */
+	    goto top;		/* count(1) */
+	  }
+      }
+    return 16;
+}
+
 void
 call_goto ()
 {
@@ -117,6 +140,7 @@ call_goto ()
   goto_val += test_goto1 (1);
   goto_val += test_goto2 (3);
   goto_val += test_goto2 (30);
+  goto_val += test_goto3 (0, 1);
 }
 
 /* Check nested if-then-else statements. */
@@ -260,7 +284,7 @@ main()
   call_unref ();
   if ((for_val1 != 12)
       || (for_val2 != 87)
-      || (goto_val != 15)
+      || (goto_val != 31)
       || (ifelse_val1 != 31)
       || (ifelse_val2 != 23)
       || (ifelse_val3 != 246)
-- 
2.34.0