From 2e3897490e0f99b22a2813cfb34d59a1ea71ff68 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 17 Apr 2020 16:59:57 +0200
Subject: [PATCH] c, c++: Fix two redundantAssignment warnings [PR94629]
This change fixes two obvious redundant assignments reported by cppcheck:
trunk.git/gcc/c/c-parser.c:16969:2: style: Variable 'data.clauses' is reassigned a value before the old one has been used. [redundantAssignment]
trunk.git/gcc/cp/call.c:5116:9: style: Variable 'arg2' is reassigned a value before the old one has been used. [redundantAssignment]
2020-04-17 Jakub Jelinek <jakub@redhat.com>
PR other/94629
* c-parser.c (c_parser_oacc_routine): Remove redundant assignment
to data.clauses.
* call.c (build_conditional_expr_1): Remove redundant assignment to
arg2.
---
gcc/c/ChangeLog | 6 ++++++
gcc/c/c-parser.c | 1 -
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/call.c | 2 +-
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index a1831d46f120..b6af67617880 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/94629
+ * c-parser.c (c_parser_oacc_routine): Remove redundant assignment
+ to data.clauses.
+
2020-04-15 Jakub Jelinek <jakub@redhat.com>
PR c/94593
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 679c14db29cd..4e90d55f30f4 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -16939,7 +16939,6 @@ c_parser_oacc_routine (c_parser *parser, enum pragma_context context)
oacc_routine_data data;
data.error_seen = false;
data.fndecl_seen = false;
- data.clauses = NULL_TREE;
data.loc = c_parser_peek_token (parser)->location;
c_parser_consume_pragma (parser);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b2acd8927193..8410ff1d1cbc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/94629
+ * call.c (build_conditional_expr_1): Remove redundant assignment to
+ arg2.
+
2020-04-16 Patrick Palka <ppalka@redhat.com>
PR c++/94475
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 1f3d9d23b5b2..c58231601c98 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5112,7 +5112,7 @@ build_conditional_expr_1 (const op_location_t &loc,
/* Make sure that lvalues remain lvalues. See g++.oliva/ext1.C. */
if (glvalue_p (arg1))
{
- arg2 = arg1 = cp_stabilize_reference (arg1);
+ arg1 = cp_stabilize_reference (arg1);
arg2 = arg1 = prevent_lifetime_extension (arg1);
}
else
--
GitLab