Add missing-END_CATCH detection/protection (to gdb's TRY/CATCH/END_CATCH)

While we still have cleanups (i.e., make_cleanup & co), we must be
sure to add END_CATCH at the end of a TRY/CATCH/END_CATCH construct.
However, it's currently too easy to miss adding the END_CATCH, because
the code compiles anyway without it.  I realized this when I noticed
that another patch I was working on missed several adding END_CATCH in
several new TRY/CATCH uses.

This commit fixes that by making TRY open a new scope that is only
closed by END_CATCH.  This way, if you forget to add the END_CATCH,
then compilation fails due to the unbalanced curly braces.

This caught a couple places where we were missing END_CATCH in current
master, also fixed by the patch.

gdb/ChangeLog:
2017-10-04  Pedro Alves  <palves@redhat.com>

	* cli/cli-cmds.c (complete_command): Add missing END_CATCH.
	* common/common-exceptions.h (TRY): Open an outermost scope.
	Expand intro comment.
	(CATCH): Reindent.
	(END_CATCH): Close the outermost scope.
	* completer.c (complete_line_internal): Add missing END_CATCH.
This commit is contained in:
Pedro Alves 2017-10-04 09:55:29 +01:00
parent bc3b087de2
commit a87c142792
3 changed files with 29 additions and 14 deletions

View file

@ -296,6 +296,7 @@ complete_command (char *arg_entry, int from_tty)
{
return;
}
END_CATCH
std::string arg_prefix (arg, word - arg);