c++: Set the outer brace marker for missed cases.

In some cases, a function might be declared as FUNCTION_NEEDS_BODY_BLOCK
but all the content is contained within that block.  However, poplevel
is currently assuming that such cases would always contain subblocks.

In the case that we do have a body block, but there are no subblocks
then st the outer brace marker on the body block.  This situation occurs
for at least coroutine lambda ramp functions and empty constructors.

gcc/cp/ChangeLog:

	* decl.cc (poplevel): Set BLOCK_OUTER_CURLY_BRACE_P on the
	body block for functions with no subblocks.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 03e8c98d4b6845d64eb9ce5b51356f91d3ffadb6..a9ef28bfd80510538b793879902086310713a706 100644 (file)
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -846,11 +846,9 @@ poplevel (int keep, int reverse, int functionbody)
       DECL_INITIAL (current_function_decl) = block ? block : subblocks;
       if (subblocks)
        {
-         if (FUNCTION_NEEDS_BODY_BLOCK (current_function_decl))
-           {
-             if (BLOCK_SUBBLOCKS (subblocks))
-               BLOCK_OUTER_CURLY_BRACE_P (BLOCK_SUBBLOCKS (subblocks)) = 1;
-           }
+         if (FUNCTION_NEEDS_BODY_BLOCK (current_function_decl)
+             && BLOCK_SUBBLOCKS (subblocks))
+           BLOCK_OUTER_CURLY_BRACE_P (BLOCK_SUBBLOCKS (subblocks)) = 1;
          else
            BLOCK_OUTER_CURLY_BRACE_P (subblocks) = 1;
        }