obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

3 files changed, 314 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/bprob/bprob.exp b/gcc/testsuite/g++.dg/bprob/bprob.exp
new file mode 100644
index 000000000..8a46cf7be
--- /dev/null
+++ b/gcc/testsuite/g++.dg/bprob/bprob.exp
@@ -0,0 +1,65 @@
+#   Copyright (C) 2001, 2002, 2004, 2007, 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+# Test the functionality of programs compiled with profile-directed block
+# ordering using -fprofile-arcs followed by -fbranch-probabilities.
+
+load_lib target-supports.exp
+
+# Some targets don't have any implementation of __bb_init_func or are
+# missing other needed machinery.
+if { ![check_profiling_available "-fprofile-arcs"] } {
+    return
+}
+
+# The procedures in profopt.exp need these parameters.
+set tool g++
+set prof_ext "gcda"
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# Override the list defined in profopt.exp.
+set PROFOPT_OPTIONS [list \
+	{ -g } \
+	{ -O0 } \
+	{ -O1 } \
+	{ -O2 } \
+	{ -O3 } \
+	{ -O3 -g } \
+	{ -Os } ]
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# Load support procs.
+load_lib profopt.exp
+
+set profile_options "-fprofile-arcs"
+set feedback_options "-fprofile-use"
+
+# Main loop.
+foreach profile_option $profile_options feedback_option $feedback_options {
+    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.C]] {
+        # If we're only testing specific files and this isn't one of them, skip it.
+        if ![runtest_file_p $runtests $src] then {
+            continue
+        }
+        profopt-execute $src
+    }
+}
diff --git a/gcc/testsuite/g++.dg/bprob/g++-bprob-1.C b/gcc/testsuite/g++.dg/bprob/g++-bprob-1.C
new file mode 100644
index 000000000..b1a1de77e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/bprob/g++-bprob-1.C
@@ -0,0 +1,234 @@
+/* Check that various C constructs (in C++) don't cause problems for
+ * profile-directed block ordering.
+
+   Most of this test is the same as bprob-1.c and gcov-4.c in
+   gcc.misc-tests.  The "count" comments are left in to make comparisons
+   easier; they are ignored for this test. */
+
+extern "C" void abort (void);
+
+/* Check for loops. */
+
+int for_val1;
+int for_val2;
+int for_temp;
+
+int
+test_for1 (int n)
+{
+  int i;
+  for_temp = 1;				/* count(3) */
+  for (i = 0; i < n; i++)
+    for_temp++;				/* count(9) */
+  return for_temp;			/* count(3) */
+}
+
+int
+test_for2 (int m, int n, int o)
+{
+  int i, j, k;
+  for_temp = 1;				/* count(6) */
+  for (i = 0; i < n; i++)
+    for (j = 0; j < m; j++)
+      for (k = 0; k < o; k++)
+	for_temp++;			/* count(81) */
+  return for_temp;			/* count(6) */
+}
+
+int
+call_for ()
+{
+  for_val1 += test_for1 (0);
+  for_val1 += test_for1 (2);
+  for_val1 += test_for1 (7);
+
+  for_val2 += test_for2 (0, 0, 0);
+  for_val2 += test_for2 (1, 0, 0);
+  for_val2 += test_for2 (1, 3, 0);
+  for_val2 += test_for2 (1, 3, 1);
+  for_val2 += test_for2 (3, 1, 5);
+  for_val2 += test_for2 (3, 7, 3);
+}
+
+/* Check the use of goto. */
+
+int goto_val;
+
+int
+test_goto1 (int f)
+{
+  if (f)				/* count(2) */
+    goto lab1;				/* count(1) */
+  return 1;				/* count(1) */
+lab1:
+  return 2;				/* count(1) */
+}
+
+int
+test_goto2 (int f)
+{
+  int i;
+  for (i = 0; i < 10; i++)		/* count(15) */
+    if (i == f) goto lab2;		/* count(14) */
+  return 4;				/* count(1) */
+lab2:
+  return 8;				/* count(1) */
+}
+
+void
+call_goto ()
+{
+  goto_val += test_goto1 (0);
+  goto_val += test_goto1 (1);
+  goto_val += test_goto2 (3);
+  goto_val += test_goto2 (30);
+}
+
+/* Check nested if-then-else statements. */
+
+int ifelse_val1;
+int ifelse_val2;
+int ifelse_val3;
+
+int
+test_ifelse1 (int i, int j)
+{
+  int result = 0;
+  if (i)				/* count(5) */
+    if (j)				/* count(3) */
+      result = 4;			/* count(3) */
+    else
+      result = 1024;
+  else
+    if (j)				/* count(2) */
+      result = 1;			/* count(1) */
+    else
+      result = 2;			/* count(1) */
+  if (i > j)				/* count(5) */
+    result *= 2;			/* count(1) */
+  if (i > 10)				/* count(5) */
+    if (j > 10)				/* count(1) */
+      result *= 4;			/* count(1) */
+  return result;			/* count(5) */
+}
+
+int
+test_ifelse2 (int i)
+{
+  int result = 0;
+  if (!i)				/* count(6) */
+    result = 1;				/* count(1) */
+  if (i == 1)				/* count(6) */
+    result = 1024;
+  if (i == 2)				/* count(6) */
+    result = 2;				/* count(3) */
+  if (i == 3)				/* count(6) */
+    return 8;				/* count(2) */
+  if (i == 4)				/* count(4) */
+    return 2048;
+  return result;			/* count(4) */
+}
+
+int
+test_ifelse3 (int i, int j)
+{
+  int result = 1;
+  if (i > 10 && j > i && j < 20)	/* count(11) */
+    result = 16;			/* count(1) */
+  if (i > 20)				/* count(11) */
+    if (j > i)				/* count(5) */
+      if (j < 30)			/* count(2) */
+	result = 32;			/* count(1) */
+  if (i == 3 || j == 47 || i == j)	/* count(11) */
+    result = 64;			/* count(3) */
+  return result;			/* count(11) */
+}
+
+void
+call_ifelse ()
+{
+  ifelse_val1 += test_ifelse1 (0, 2);
+  ifelse_val1 += test_ifelse1 (0, 0);
+  ifelse_val1 += test_ifelse1 (1, 2);
+  ifelse_val1 += test_ifelse1 (10, 2);
+  ifelse_val1 += test_ifelse1 (11, 11);
+
+  ifelse_val2 += test_ifelse2 (0);
+  ifelse_val2 += test_ifelse2 (2);
+  ifelse_val2 += test_ifelse2 (2);
+  ifelse_val2 += test_ifelse2 (2);
+  ifelse_val2 += test_ifelse2 (3);
+  ifelse_val2 += test_ifelse2 (3);
+
+  ifelse_val3 += test_ifelse3 (11, 19);
+  ifelse_val3 += test_ifelse3 (25, 27);
+  ifelse_val3 += test_ifelse3 (11, 22);
+  ifelse_val3 += test_ifelse3 (11, 10);
+  ifelse_val3 += test_ifelse3 (21, 32);
+  ifelse_val3 += test_ifelse3 (21, 20);
+  ifelse_val3 += test_ifelse3 (1, 2);
+  ifelse_val3 += test_ifelse3 (32, 31);
+  ifelse_val3 += test_ifelse3 (3, 0);
+  ifelse_val3 += test_ifelse3 (0, 47);	/* count(1) */
+  ifelse_val3 += test_ifelse3 (65, 65);	/* count(1) */
+}
+
+/* Check switch statements. */
+
+int switch_val, switch_m;
+
+int
+test_switch (int i, int j)
+{
+  int result = 0;			/* count(5) */
+
+  switch (i)				/* count(5) */
+    {
+      case 1:
+        result = 2;			/* count(1) */
+        break;
+      case 2:
+        result = 1024;
+        break;
+      case 3:
+      case 4:
+        if (j == 2)			/* count(3) */
+          return 4;			/* count(1) */
+        result = 8;			/* count(2) */
+        break;
+      default:
+	result = 32;			/* count(1) */
+	switch_m++;			/* count(1) */
+        break;
+    }
+  return result;			/* count(4) */
+}
+
+void
+call_switch ()
+{
+  switch_val += test_switch (1, 0);
+  switch_val += test_switch (3, 0);
+  switch_val += test_switch (3, 2);
+  switch_val += test_switch (4, 0);
+  switch_val += test_switch (16, 0);	
+  switch_val += switch_m;
+}
+
+int
+main()
+{
+  call_for ();
+  call_goto ();
+  call_ifelse ();
+  call_switch ();
+  if ((for_val1 != 12)
+      || (for_val2 != 87)
+      || (goto_val != 15)
+      || (ifelse_val1 != 31)
+      || (ifelse_val2 != 23)
+      || (ifelse_val3 != 246)
+      || (switch_val != 55))
+    abort ();
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/bprob/g++-bprob-2.C b/gcc/testsuite/g++.dg/bprob/g++-bprob-2.C
new file mode 100644
index 000000000..23577d47e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/bprob/g++-bprob-2.C
@@ -0,0 +1,15 @@
+namespace {
+
+int calc(int j)
+{
+  if (j==0) return 0;
+  return calc(j-1)*j % 17;
+}
+
+}
+
+int main(void)
+{
+  return calc(25);
+}
+