Fix another false gcc6 compilation warning (Mark Wielaard).
This commit is contained in:
parent
4f2557176f
commit
2e597932c2
168
gdb-upstream.patch
Normal file
168
gdb-upstream.patch
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
[PATCH] Fix GCC6 -Wmisleading-indentation issues.
|
||||||
|
https://sourceware.org/ml/gdb-patches/2016-01/msg00632.html
|
||||||
|
|
||||||
|
commit a579cd9aa8c57c8a54833f26452a1afef38e5d20
|
||||||
|
Author: Mark Wielaard <mjw@redhat.com>
|
||||||
|
Date: Mon Jan 25 20:29:54 2016 +0100
|
||||||
|
|
||||||
|
Fix GCC6 -Wmisleading-indentation issues.
|
||||||
|
|
||||||
|
GCC6 will warn about misleading indentation issues like:
|
||||||
|
|
||||||
|
gdb/ada-lang.c: In function ‘ada_evaluate_subexp’:
|
||||||
|
ada-lang.c:11423:9: error: statement is indented as if it were guarded by...
|
||||||
|
arg1 = unwrap_value (arg1);
|
||||||
|
^~~~
|
||||||
|
|
||||||
|
gdb/ada-lang.c:11421:7: note: ...this ‘else’ clause, but it is not
|
||||||
|
else
|
||||||
|
^~~~
|
||||||
|
|
||||||
|
In this case it would be a bug except for the fact the if clause already
|
||||||
|
returned early. So this misindented statement really only got executed
|
||||||
|
for the else case. But it could easily mislead a reader, so adding a
|
||||||
|
proper else block is the correct solution.
|
||||||
|
|
||||||
|
In case of c-typeprint.c (c_type_print_base) the if statement is indeed
|
||||||
|
misleadingly indented, but not a bug. Just indent correctly. The inflow.c
|
||||||
|
(terminal_ours_1) misindented block comes from the removal of an if clause
|
||||||
|
in commit d9d2d8b which looks correct. Just introduce an else to fixup the
|
||||||
|
indentation of the block. The linux-record.c misleadingly indented return
|
||||||
|
statements are just that. Misleading to the reader, but not actual bugs.
|
||||||
|
Just unindent them so they don't look like they fall under the wrong if
|
||||||
|
clause.
|
||||||
|
|
||||||
|
### a/gdb/ChangeLog
|
||||||
|
### b/gdb/ChangeLog
|
||||||
|
## -1,3 +1,14 @@
|
||||||
|
+2016-01-25 Mark Wielaard <mjw@redhat.com>
|
||||||
|
+
|
||||||
|
+ * ada-lang.c (ada_evaluate_subexp): Add proper else block.
|
||||||
|
+ * c-typeprint.c (c_type_print_base): Fix misleading indentation of
|
||||||
|
+ if statement.
|
||||||
|
+ * inflow.c (child_terminal_ours_1): Fix misleading indentation of
|
||||||
|
+ statement block by introducing an else.
|
||||||
|
+ * linux-record.c (record_linux_sockaddr): Fix misleading indentation
|
||||||
|
+ of return statements.
|
||||||
|
+ (record_linux_msghdr): Likewise.
|
||||||
|
+
|
||||||
|
2016-01-25 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
PR threads/19461
|
||||||
|
--- a/gdb/ada-lang.c
|
||||||
|
+++ b/gdb/ada-lang.c
|
||||||
|
@@ -11419,9 +11419,11 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
||||||
|
return value_zero (ada_aligned_type (type), lval_memory);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- arg1 = ada_value_struct_elt (arg1, &exp->elts[pc + 2].string, 0);
|
||||||
|
- arg1 = unwrap_value (arg1);
|
||||||
|
- return ada_to_fixed_value (arg1);
|
||||||
|
+ {
|
||||||
|
+ arg1 = ada_value_struct_elt (arg1, &exp->elts[pc + 2].string, 0);
|
||||||
|
+ arg1 = unwrap_value (arg1);
|
||||||
|
+ return ada_to_fixed_value (arg1);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
case OP_TYPE:
|
||||||
|
/* The value is not supposed to be used. This is here to make it
|
||||||
|
--- a/gdb/c-typeprint.c
|
||||||
|
+++ b/gdb/c-typeprint.c
|
||||||
|
@@ -1305,27 +1305,27 @@ c_type_print_base (struct type *type, struct ui_file *stream,
|
||||||
|
if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
|
||||||
|
fprintf_filtered (stream, "\n");
|
||||||
|
|
||||||
|
- for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
|
||||||
|
- {
|
||||||
|
- struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
|
||||||
|
-
|
||||||
|
- /* Dereference the typedef declaration itself. */
|
||||||
|
- gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
|
||||||
|
- target = TYPE_TARGET_TYPE (target);
|
||||||
|
-
|
||||||
|
- print_spaces_filtered (level + 4, stream);
|
||||||
|
- fprintf_filtered (stream, "typedef ");
|
||||||
|
-
|
||||||
|
- /* We want to print typedefs with substitutions
|
||||||
|
- from the template parameters or globally-known
|
||||||
|
- typedefs but not local typedefs. */
|
||||||
|
- c_print_type (target,
|
||||||
|
- TYPE_TYPEDEF_FIELD_NAME (type, i),
|
||||||
|
- stream, show - 1, level + 4,
|
||||||
|
- &semi_local_flags);
|
||||||
|
- fprintf_filtered (stream, ";\n");
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
+ for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
|
||||||
|
+ {
|
||||||
|
+ struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
|
||||||
|
+
|
||||||
|
+ /* Dereference the typedef declaration itself. */
|
||||||
|
+ gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
|
||||||
|
+ target = TYPE_TARGET_TYPE (target);
|
||||||
|
+
|
||||||
|
+ print_spaces_filtered (level + 4, stream);
|
||||||
|
+ fprintf_filtered (stream, "typedef ");
|
||||||
|
+
|
||||||
|
+ /* We want to print typedefs with substitutions
|
||||||
|
+ from the template parameters or globally-known
|
||||||
|
+ typedefs but not local typedefs. */
|
||||||
|
+ c_print_type (target,
|
||||||
|
+ TYPE_TYPEDEF_FIELD_NAME (type, i),
|
||||||
|
+ stream, show - 1, level + 4,
|
||||||
|
+ &semi_local_flags);
|
||||||
|
+ fprintf_filtered (stream, ";\n");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
fprintfi_filtered (level, stream, "}");
|
||||||
|
}
|
||||||
|
--- a/gdb/inflow.c
|
||||||
|
+++ b/gdb/inflow.c
|
||||||
|
@@ -412,7 +412,7 @@ child_terminal_ours_1 (int output_only)
|
||||||
|
|
||||||
|
if (tinfo->run_terminal != NULL || gdb_has_a_terminal () == 0)
|
||||||
|
return;
|
||||||
|
-
|
||||||
|
+ else
|
||||||
|
{
|
||||||
|
#ifdef SIGTTOU
|
||||||
|
/* Ignore this signal since it will happen when we try to set the
|
||||||
|
--- a/gdb/linux-record.c
|
||||||
|
+++ b/gdb/linux-record.c
|
||||||
|
@@ -112,7 +112,7 @@ record_linux_sockaddr (struct regcache *regcache,
|
||||||
|
"memory at addr = 0x%s len = %d.\n",
|
||||||
|
phex_nz (len, tdep->size_pointer),
|
||||||
|
tdep->size_int);
|
||||||
|
- return -1;
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
addrlen = (int) extract_unsigned_integer (a, tdep->size_int, byte_order);
|
||||||
|
if (addrlen <= 0 || addrlen > tdep->size_sockaddr)
|
||||||
|
@@ -150,7 +150,7 @@ record_linux_msghdr (struct regcache *regcache,
|
||||||
|
"len = %d.\n",
|
||||||
|
phex_nz (addr, tdep->size_pointer),
|
||||||
|
tdep->size_msghdr);
|
||||||
|
- return -1;
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* msg_name msg_namelen */
|
||||||
|
@@ -188,7 +188,7 @@ record_linux_msghdr (struct regcache *regcache,
|
||||||
|
"len = %d.\n",
|
||||||
|
phex_nz (addr,tdep->size_pointer),
|
||||||
|
tdep->size_iovec);
|
||||||
|
- return -1;
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
tmpaddr = (CORE_ADDR) extract_unsigned_integer (iov,
|
||||||
|
tdep->size_pointer,
|
||||||
|
@@ -983,7 +983,7 @@ Do you want to stop the program?"),
|
||||||
|
"memory at addr = 0x%s len = %d.\n",
|
||||||
|
OUTPUT_REG (tmpulongest, tdep->arg2),
|
||||||
|
tdep->size_ulong);
|
||||||
|
- return -1;
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
tmpulongest = extract_unsigned_integer (a, tdep->size_ulong,
|
||||||
|
byte_order);
|
9
gdb.spec
9
gdb.spec
@ -27,7 +27,7 @@ Version: 7.10.50.%{snapsrc}
|
|||||||
|
|
||||||
# The release always contains a leading reserved number, start it at 1.
|
# The release always contains a leading reserved number, start it at 1.
|
||||||
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
||||||
Release: 48%{?dist}
|
Release: 49%{?dist}
|
||||||
|
|
||||||
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
|
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
|
||||||
Group: Development/Debuggers
|
Group: Development/Debuggers
|
||||||
@ -245,7 +245,7 @@ Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
|
|||||||
|
|
||||||
# Backported fixups post the source tarball.
|
# Backported fixups post the source tarball.
|
||||||
#Xdrop: Just backports.
|
#Xdrop: Just backports.
|
||||||
#Patch232: gdb-upstream.patch
|
Patch232: gdb-upstream.patch
|
||||||
|
|
||||||
# Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
|
# Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
|
||||||
#=fedoratest+ppc
|
#=fedoratest+ppc
|
||||||
@ -755,7 +755,7 @@ find -name "*.info*"|xargs rm -f
|
|||||||
# Match the Fedora's version info.
|
# Match the Fedora's version info.
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
#patch232 -p1
|
%patch232 -p1
|
||||||
%patch349 -p1
|
%patch349 -p1
|
||||||
%patch1058 -p1
|
%patch1058 -p1
|
||||||
%patch1059 -p1
|
%patch1059 -p1
|
||||||
@ -1393,6 +1393,9 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 31 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.50.20160121-49.fc24
|
||||||
|
- Fix another false gcc6 compilation warning (Mark Wielaard).
|
||||||
|
|
||||||
* Sun Jan 31 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.50.20160121-48.fc24
|
* Sun Jan 31 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.50.20160121-48.fc24
|
||||||
- Fix false gcc6 compilation warning for: bfd/elf64-s390.c
|
- Fix false gcc6 compilation warning for: bfd/elf64-s390.c
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user