[c++-concepts] Merge from trunk

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

trunk was merged into c++-concepts branch at revision 201560.
I resolved some conflicts in cp caused by recent merges and ongoing work
on trunk.

-- Gaby

[c++-concepts] merge from trunk

[Andrew Sutton]

I just merged the concepts branch with trunk, after fighting with the
testing framework for the past hour. There was a change to

gcc/testsuite/lib/prune.exp

yesterday that doesn't appear to be compatible with *something* in
this branch. It broke the entire test suite, giving the errors below
for every .exp file.

Using /home/faculty/asutton/local/share/dejagnu/baseboards/unix.exp as
board description file for target.
Using /home/faculty/asutton/local/share/dejagnu/config/unix.exp as
generic interface file for target.
Using /home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/config/default.exp
as tool-and-target-specific interface file.
Running /home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/compile.exp
...
ERROR: tcl error sourcing
/home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/compile.exp.
ERROR: couldn't compile regular expression pattern: quantifier operand invalid
    while executing
"regsub -all "$srcdir\/" $text "" text"
    (procedure "prune_gcc_output" line 50)
    invoked from within
"prune_gcc_output $text"
    (procedure "gcc-dg-prune" line 8)
    invoked from within
"${tool}-dg-prune $target_triplet $comp_output"
    (procedure "saved-dg-test" line 183)
    invoked from within
"saved-dg-test /home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/20000105-1.c
{  -O0 } -w"
    ("eval" body line 1)
    invoked from within
"eval saved-dg-test $args "
    (procedure "dg-test" line 11)
    invoked from within
"dg-test $test "$flags $flags_t" ${default-extra-flags}"
    (procedure "gcc-dg-runtest" line 33)
    invoked from within
"gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" "-w""
    (file "/home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/compile.exp"
line 30)
    invoked from within
"source /home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/compile.exp"
    ("uplevel" body line 1)
    invoked from within
"uplevel #0 source
/home/faculty/asutton/Code/gcc/c++-concepts/gcc/testsuite/gcc.c-torture/compile/compile.exp"
    invoked from within
"catch "uplevel #0 source $test_file_name""

I removed the offending line of code in this branch just to make the tests run.

That change does not affect any other builds on my system, so
something isn't being configured correctly. I just can't find what it
is.

Andrew

[c++-concepts] merge from trunk

[Gabriel Dos Reis]

at revision 202396.  No conflict.

-- Gaby

[c++-concepts] MErge from trunk

[Gabriel Dos Reis]

at revision 201992.
There were conflicts with the recent pretty printing patches.
Fixed.  (Mostly due to the new concept-specific nodes printing.)
Modulo the asan stuff.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

The c++-concepts branch was synchronized with trunk at revision 201834.

-- Gaby

Re: [c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Tom Tromey <tromey@redhat.com> writes:

| >>>>> "Gaby" == Gabriel Dos Reis <gdr@axiomatics.org> writes:
| 
| Gaby> We will have to watch out for Tom's Makefile rewrite work.
| 
| FWIW, I've found rebasing this series to be very easy.
| Due to the way it is split up, only one patch (the big manual dependency
| removal one) only ever has "hard" conflicts, and that patch is 99%
| deletion of a huge block -- easy to recreate.

OK, that is good to know.  Thanks!

-- Gaby

Re: [c++-concepts] Merge from trunk

[Tom Tromey]

>>>>> "Gaby" == Gabriel Dos Reis <gdr@axiomatics.org> writes:

Gaby> We will have to watch out for Tom's Makefile rewrite work.

FWIW, I've found rebasing this series to be very easy.
Due to the way it is split up, only one patch (the big manual dependency
removal one) only ever has "hard" conflicts, and that patch is 99%
deletion of a huge block -- easy to recreate.

Tom

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Andrew Sutton <andrew.n.sutton@gmail.com> writes:

| Committed.

Merge from trunk as of revision 201285.

We will have to watch out for Tom's Makefile rewrite work.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Trunk was merged to the c++-concept branch at revision 200958.

Andrew --
There aere a few conflicts surronding introduction of
can_convert_standard, between your version and the one Jason committed.
I resolved them in favour of Jason's because his version followed the
GNU coding convention (when a binary expression spans several lines, the
binary operator starts the new line, etc.)

The split of cp/semantics.c into cp/lambda.c and the rest introduced a
conflict at the Makefile level.  Resolved.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Andrew -- 

At revision 200343.

With the merge of Cilk changes to trunk, it was necessary to synchronize
so that c++-concepts branch doesn't get too out of sync.  There were a
few conflicts in cp/Make-lang.in and cp/cp-tree.h that I think I
resolved properly.  Let me know if anything else was lost (I think not.)


-- Gaby

[c++-concepts] merge from trunk

[Gabriel Dos Reis]

At revision 200282.

Andrew -- 
there was a slight conflict with the new usage of is_binary_trait.
I think I resolved it properly, but double check.

-- Gaby

[c++-concepts] merge from trunk

[Gabriel Dos Reis]

Trunk was merged into c++-concepts branch at revision 198984.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Trunk was merged into the c++-concept branch as of revision 198506.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Trunk as been merged into the c++-concepts branch.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

The trunk was merged into the c++-concepts branch as of revision 197225.

-- Gaby

[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

I've merged changes from trunk into the c++-concepts branch as of
revision 196857.  These include Jason's patch to stop randomness
in linkage name of entities defined at unnamed namespace scopes.


-- Gaby