diff options
| author | Marek Polacek <polacek@redhat.com> | 2016-10-03 08:10:43 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2016-10-03 08:10:43 +0000 |
| commit | f41f1ceba6d40fe50f49dcb1b45af37997cb7c20 (patch) | |
| tree | e53987fa3bca08d04479e37deec4b791304c6bc2 /gcc/cp | |
| parent | 1633d3b91af987aefd53b64cd4071923e1f45502 (diff) | |
| download | gcc-f41f1ceba6d40fe50f49dcb1b45af37997cb7c20.zip gcc-f41f1ceba6d40fe50f49dcb1b45af37997cb7c20.tar.gz gcc-f41f1ceba6d40fe50f49dcb1b45af37997cb7c20.tar.bz2 | |
Core 903
Core 903
* typeck.c (cp_build_binary_op): Pass original operands to
null_ptr_cst_p, not those after the default conversions.
* g++.dg/cpp0x/nullptr37.C: New test.
From-SVN: r240707
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 595624c..0f27cfd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-10-03 Marek Polacek <polacek@redhat.com> + + Core 903 + * typeck.c (cp_build_binary_op): Pass original operands to + null_ptr_cst_p, not those after the default conversions. + 2016-10-03 Bernd Edlinger <bernd.edlinger@hotmail.de> * parser.c (cp_parser_condition): Fix a warning. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 617ca55..8b780be 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4573,7 +4573,7 @@ cp_build_binary_op (location_t location, || code1 == COMPLEX_TYPE || code1 == ENUMERAL_TYPE)) short_compare = 1; else if (((code0 == POINTER_TYPE || TYPE_PTRDATAMEM_P (type0)) - && null_ptr_cst_p (op1)) + && null_ptr_cst_p (orig_op1)) /* Handle, eg, (void*)0 (c++/43906), and more. */ || (code0 == POINTER_TYPE && TYPE_PTR_P (type1) && integer_zerop (op1))) @@ -4587,7 +4587,7 @@ cp_build_binary_op (location_t location, warn_for_null_address (location, op0, complain); } else if (((code1 == POINTER_TYPE || TYPE_PTRDATAMEM_P (type1)) - && null_ptr_cst_p (op0)) + && null_ptr_cst_p (orig_op0)) /* Handle, eg, (void*)0 (c++/43906), and more. */ || (code1 == POINTER_TYPE && TYPE_PTR_P (type0) && integer_zerop (op0))) @@ -4604,7 +4604,7 @@ cp_build_binary_op (location_t location, || (TYPE_PTRDATAMEM_P (type0) && TYPE_PTRDATAMEM_P (type1))) result_type = composite_pointer_type (type0, type1, op0, op1, CPO_COMPARISON, complain); - else if (null_ptr_cst_p (op0) && null_ptr_cst_p (op1)) + else if (null_ptr_cst_p (orig_op0) && null_ptr_cst_p (orig_op1)) /* One of the operands must be of nullptr_t type. */ result_type = TREE_TYPE (nullptr_node); else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE) @@ -4623,7 +4623,7 @@ cp_build_binary_op (location_t location, else return error_mark_node; } - else if (TYPE_PTRMEMFUNC_P (type0) && null_ptr_cst_p (op1)) + else if (TYPE_PTRMEMFUNC_P (type0) && null_ptr_cst_p (orig_op1)) { if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_delta) @@ -4664,7 +4664,7 @@ cp_build_binary_op (location_t location, } result_type = TREE_TYPE (op0); } - else if (TYPE_PTRMEMFUNC_P (type1) && null_ptr_cst_p (op0)) + else if (TYPE_PTRMEMFUNC_P (type1) && null_ptr_cst_p (orig_op0)) return cp_build_binary_op (location, code, op1, op0, complain); else if (TYPE_PTRMEMFUNC_P (type0) && TYPE_PTRMEMFUNC_P (type1)) { @@ -4877,21 +4877,21 @@ cp_build_binary_op (location_t location, else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE) result_type = composite_pointer_type (type0, type1, op0, op1, CPO_COMPARISON, complain); - else if (code0 == POINTER_TYPE && null_ptr_cst_p (op1)) + else if (code0 == POINTER_TYPE && null_ptr_cst_p (orig_op1)) { result_type = type0; if (extra_warnings && (complain & tf_warning)) warning (OPT_Wextra, "ordered comparison of pointer with integer zero"); } - else if (code1 == POINTER_TYPE && null_ptr_cst_p (op0)) + else if (code1 == POINTER_TYPE && null_ptr_cst_p (orig_op0)) { result_type = type1; if (extra_warnings && (complain & tf_warning)) warning (OPT_Wextra, "ordered comparison of pointer with integer zero"); } - else if (null_ptr_cst_p (op0) && null_ptr_cst_p (op1)) + else if (null_ptr_cst_p (orig_op0) && null_ptr_cst_p (orig_op1)) /* One of the operands must be of nullptr_t type. */ result_type = TREE_TYPE (nullptr_node); else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE) |