diff options
| author | bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-28 04:56:47 +0000 |
|---|---|---|
| committer | bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-28 04:56:47 +0000 |
| commit | 1f63a7d666901121bd8e1a65478855d735fac9a0 (patch) | |
| tree | a7b2e8cf678fd319d296b231776140e3a5a093d0 /gcc/cp | |
| parent | 48e08ee00c39fadc48298b556b6fbcf04bdd9f02 (diff) | |
| download | gcc-1f63a7d666901121bd8e1a65478855d735fac9a0.tar.gz | |
Revert:
PR c++/35652
2009-03-27 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
gcc/
* builtins.c (c_strlen): Do not warn here.
* c-typeck.c (build_binary_op): Adjust calls to pointer_int_sum.
* c-common.c (pointer_int_sum): Take an explicit location.
Warn about offsets out of bounds.
* c-common.h (pointer_int_sum): Adjust declaration.
cp/
* typeck.c (cp_pointer_sum): Adjust call to pointer_int_sum.
testsuite/
* gcc.dg/pr35652.C: New.
* g++.dg/warn/pr35652.C: New.
* gcc.dg/format/plus-1.c: Adjust message.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146870 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 95aff1f542d..710484b582e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2009-04-28 Ben Elliston <bje@au.ibm.com> + + PR c++/35652 + Revert: + + 2009-03-27 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + * typeck.c (cp_pointer_sum): Adjust call to pointer_int_sum. + 2009-04-27 Ian Lance Taylor <iant@google.com> * semantics.c (finish_omp_clauses): Change type of c_kind to enum diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 69d5529476d..5486c546b68 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4054,7 +4054,7 @@ cp_pointer_int_sum (enum tree_code resultcode, tree ptrop, tree intop) pointer_int_sum() anyway. */ complete_type (TREE_TYPE (res_type)); - return pointer_int_sum (input_location, resultcode, ptrop, + return pointer_int_sum (resultcode, ptrop, fold_if_not_in_template (intop)); } |