From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19034 invoked by alias); 18 Sep 2012 04:30:26 -0000 Received: (qmail 18708 invoked by uid 22791); 18 Sep 2012 04:30:08 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,SPF_SOFTFAIL,TW_BJ X-Spam-Check-By: sourceware.org Received: from mail-pb0-f41.google.com (HELO mail-pb0-f41.google.com) (209.85.160.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 18 Sep 2012 04:29:51 +0000 Received: by pbbro12 with SMTP id ro12so11721268pbb.0 for ; Mon, 17 Sep 2012 21:29:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=g/Ah6K5GQPHHNHzdrJnQlEdchmM6ZljMoGumiCBGWxM=; b=oHcyu/nRUG8f0Ah/iX37FeQwmKitXX7aMMf5nIrUQEmiT7kucVgwgbBBKFI+GrfFkB TpXy07525t9SHvByqdgz4dw6dA/Vg1+eKYCYeKeC4RaA/ouPG26e4tvJtL4r0UXOiIJR /SoGN2/B38NbeMofQCh+FMkvKcgZRSpZ25X9S2KEsshInDUtvsFH1DBVB2EsTgL5+Wej 0ProLr/06QdsIOHOJrBoAI2WWMN2P4QiMHO7l45C8+9mDyCQn9STupLbroXlJRgpkcH/ 51dFvxpsZYLD9edWj6g0ZEXdK4rjDcvkwYyWHyd5ktNlEqRvf5UgqHTILnDbAI44Vlx5 dBMg== Received: by 10.66.78.73 with SMTP id z9mr24123101paw.9.1347942590647; Mon, 17 Sep 2012 21:29:50 -0700 (PDT) Received: from divine-comedy.divine-comedy (ec2-122-248-200-206.ap-southeast-1.compute.amazonaws.com. [122.248.200.206]) by mx.google.com with ESMTPS id pn4sm8003659pbb.50.2012.09.17.21.29.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 21:29:49 -0700 (PDT) From: Sanjoy Das To: gdb-patches@sourceware.org Cc: Sanjoy Das Subject: [PATCH 1/3] Fix http://sourceware.org/bugzilla/show_bug.cgi?id=14550 Date: Tue, 18 Sep 2012 04:30:00 -0000 Message-Id: <1347942847-31510-2-git-send-email-sanjoy@playingwithpointers.com> In-Reply-To: <1347942847-31510-1-git-send-email-sanjoy@playingwithpointers.com> References: <1347942847-31510-1-git-send-email-sanjoy@playingwithpointers.com> X-Gm-Message-State: ALoCoQkCBTWQZn/xia1Gx9HXlMDrAAEIjT/uTzLOOBQa9Y14pLugTvbPcWJ/q2CWL7g14wx64w3a X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-09/txt/msg00340.txt.bz2 --- gdb/ChangeLog | 7 +++++++ gdb/jit.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ab15c4..a1c55e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-09-18 Sanjoy Das + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2012-09-17 Mike Wrighton * MAINTAINERS (Write After Approval): Add "Mike Wrighton". diff --git a/gdb/jit.c b/gdb/jit.c index 9e8f295..2f9d426 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) gdb_block_iter = gdb_block_iter->next) { if (gdb_block_iter->parent != NULL) - BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = - gdb_block_iter->parent->real_block; + { + /* If the plugin specifically mentioned a parent block, we + use that */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + gdb_block_iter->parent->real_block; + } + else + { + /* and if not, we set a default parent block. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK); + } } /* Free memory. */ -- 1.7.10.4