From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-buildbot@sergiodj.net>
Received: from kwanyin.sergiodj.net (kwanyin.sergiodj.net [158.69.185.54])
 by sourceware.org (Postfix) with ESMTPS id EA39F385B835
 for <gdb-testers@sourceware.org>; Fri, 10 Apr 2020 00:04:20 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EA39F385B835
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [binutils-gdb] Trivial fix in dwarf_decode_macro_bytes
From: gdb-buildbot@sergiodj.net
To: gdb-testers@sourceware.org
Message-Id: <2ef46c2fbbd18c3f411ef294c2c6694a1308a5a5@gdb-build>
Date: Thu, 09 Apr 2020 20:04:13 -0400
X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00, GIT_PATCH_0,
 GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE,
 SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: gdb-testers@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-testers mailing list <gdb-testers.sourceware.org>
List-Unsubscribe: <http://sourceware.org/mailman/options/gdb-testers>,
 <mailto:gdb-testers-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-testers/>
List-Post: <mailto:gdb-testers@sourceware.org>
List-Help: <mailto:gdb-testers-request@sourceware.org?subject=help>
List-Subscribe: <http://sourceware.org/mailman/listinfo/gdb-testers>,
 <mailto:gdb-testers-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2020 00:04:22 -0000

*** TEST RESULTS FOR COMMIT 2ef46c2fbbd18c3f411ef294c2c6694a1308a5a5 ***

commit 2ef46c2fbbd18c3f411ef294c2c6694a1308a5a5
Author:     Tom Tromey <tom@tromey.com>
AuthorDate: Thu Mar 26 09:28:08 2020 -0600
Commit:     Tom Tromey <tom@tromey.com>
CommitDate: Thu Mar 26 09:28:18 2020 -0600

    Trivial fix in dwarf_decode_macro_bytes
    
    One spot in dwarf_decode_macro_bytes could use the existing "objfile"
    local variable.
    
    gdb/ChangeLog
    2020-03-26  Tom Tromey  <tom@tromey.com>
    
            * dwarf2/macro.c (dwarf_decode_macro_bytes): Use objfile local
            variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c945936517..1472f6679c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-26  Tom Tromey  <tom@tromey.com>
+
+	* dwarf2/macro.c (dwarf_decode_macro_bytes): Use objfile local
+	variable.
+
 2020-03-26  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2/macro.h (dwarf_decode_macros): Make section parameter
diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index 4958639967..6c2d251465 100644
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -512,9 +512,9 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
 		    body = dwz->read_string (objfile, str_offset);
 		  }
 		else
-		  body = (dwarf2_per_objfile->str.read_string
-			  (dwarf2_per_objfile->objfile,
-			   str_offset, "DW_FORM_strp"));
+		  body = dwarf2_per_objfile->str.read_string (objfile,
+							      str_offset,
+							      "DW_FORM_strp");
 	      }
 
 	    is_define = (macinfo_type == DW_MACRO_define