[binutils-gdb] dwarf: Don't omit second operand of '?' operator

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4896932e620876a1afa1c9e8d2b8a5e49aa53d53

commit 4896932e620876a1afa1c9e8d2b8a5e49aa53d53
Author: Michael Forney <mforney@mforney.org>
Date:   Sat May 1 00:55:16 2021 -0700

    dwarf: Don't omit second operand of '?' operator
    
    This is a GNU C extension and is not valid in ISO C.
    
            * dwarf.c: Don't omit second operand of '?' operator.

Diff:
---
 binutils/ChangeLog |  4 ++++
 binutils/dwarf.c   | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5d87b196346..72f69739771 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-07  Michael Forney <mforney@mforney.org>
+
+	* dwarf.c: Don't omit second operand of '?' operator.
+
 2021-04-30  Nick Clifton  <nickc@redhat.com>
 
 	PR 27796
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index adb5c130ccd..d93d9239684 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -3826,9 +3826,13 @@ process_debug_info (struct dwarf_section * section,
 		  offset_size == 8 ? "64-bit" : "32-bit");
 	  printf (_("   Version:       %d\n"), compunit.cu_version);
 	  if (compunit.cu_version >= 5)
-	    printf (_("   Unit Type:     %s (%x)\n"),
-		    get_DW_UT_name (compunit.cu_unit_type) ?: "???",
-		    compunit.cu_unit_type);
+	    {
+	      const char *name = get_DW_UT_name (compunit.cu_unit_type);
+
+	      printf (_("   Unit Type:     %s (%x)\n"),
+		      name ? name : "???",
+		      compunit.cu_unit_type);
+	    }
 	  printf (_("   Abbrev Offset: 0x%s\n"),
 		  dwarf_vmatoa ("x", compunit.cu_abbrev_offset));
 	  printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);