From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81573 invoked by alias); 26 Jan 2017 20:24:35 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 81497 invoked by uid 89); 26 Jan 2017 20:24:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM,KAM_LAZY_DOMAIN_SECURITY,KAM_STOCKGEN,RDNS_DYNAMIC autolearn=no version=3.3.2 spammy=H*m:32412, H*MI:32412, 20633 X-HELO: yyc2.yyc-arch.org Received: from wrls-67-134-204-17.wrls.harvard.edu (HELO yyc2.yyc-arch.org) (67.134.204.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 26 Jan 2017 20:24:26 +0000 Received: by yyc2.yyc-arch.org (Postfix, from userid 1000) id 2129F26286A; Thu, 26 Jan 2017 15:24:23 -0500 (EST) From: Yichao Yu To: gdb@sourceware.org Cc: Yichao Yu Subject: [PATCH] Lookup the JIT descriptor symbol first to avoid finding the PLT entry of the breakpoint in the wrong object file. Date: Thu, 26 Jan 2017 20:24:00 -0000 Message-Id: <20170126202406.32412-1-yyc1992@gmail.com> X-IsSubscribed: yes X-SW-Source: 2017-01/txt/msg00050.txt.bz2 Fix 20633 --- gdb/jit.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gdb/jit.c b/gdb/jit.c index 158d6d8..d6eb800 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -1051,18 +1051,21 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, if (ps_data->objfile == NULL) { /* Lookup the registration symbol. If it is missing, then we - assume we are not attached to a JIT. */ - reg_symbol = lookup_minimal_symbol_and_objfile (jit_break_name); - if (reg_symbol.minsym == NULL - || BMSYMBOL_VALUE_ADDRESS (reg_symbol) == 0) - return 1; + assume we are not attached to a JIT. + Lookup the descriptor first since looking up the breakpoint might + return a PLT entry in the wrong file. */ - desc_symbol = lookup_minimal_symbol (jit_descriptor_name, NULL, - reg_symbol.objfile); + desc_symbol = lookup_minimal_symbol_and_objfile (jit_descriptor_name); if (desc_symbol.minsym == NULL || BMSYMBOL_VALUE_ADDRESS (desc_symbol) == 0) return 1; + reg_symbol = lookup_minimal_symbol (jit_break_name, NULL, + desc_symbol.objfile); + if (reg_symbol.minsym == NULL + || BMSYMBOL_VALUE_ADDRESS (reg_symbol) == 0) + return 1; + objf_data = get_jit_objfile_data (reg_symbol.objfile); objf_data->register_code = reg_symbol.minsym; objf_data->descriptor = desc_symbol.minsym; -- 2.10.2