From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14699 invoked by alias); 24 Sep 2012 04:48:18 -0000 Received: (qmail 14678 invoked by uid 22791); 24 Sep 2012 04:48:17 -0000 X-SWARE-Spam-Status: No, hits=-2.5 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; Mon, 24 Sep 2012 04:47:52 +0000 Received: by pbbro12 with SMTP id ro12so12799739pbb.0 for ; Sun, 23 Sep 2012 21:47:52 -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=uW0xQVLovJY/t6mNq3Hb99FbXt3RG98iza9SJun7Z/c=; b=jsDpSq8DYi4865ZY1J6JVmGZV3PjsoidgQH7ImkBIq9P547zQMv9OReDyRQodSmymO 0ZTY91IU+c08DpVQ2FrcSzkRTKFxVc4XPUdXB03nmjPjvS5Z+NuxGmTu31YlGFQt+JNn 2J6X/giyO4w7J3+bVsgq7MoKDxZrfQUs/qVspT0cISNTEKwt/oJ+l2gDdNjW0xOQytQX 8s/6ZSSPmUrbyTAGXAr7rfpa28/GKR5DQDBA7Y4mtDcI4C/CLFVO+rvYiNP6PhF+uwRq jr6+czHpEtcK+KHcD9z0qjFoj32nLq/N2hVj0WXoWoB5oIPqF2dxGoBubHrBXxKVJer/ vpig== Received: by 10.66.81.201 with SMTP id c9mr29493752pay.80.1348462072185; Sun, 23 Sep 2012 21:47:52 -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 b6sm8131017paz.9.2012.09.23.21.47.49 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Sep 2012 21:47:51 -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: Mon, 24 Sep 2012 04:48:00 -0000 Message-Id: <1348462325-4891-2-git-send-email-sanjoy@playingwithpointers.com> In-Reply-To: <1348462325-4891-1-git-send-email-sanjoy@playingwithpointers.com> References: <1348462325-4891-1-git-send-email-sanjoy@playingwithpointers.com> X-Gm-Message-State: ALoCoQnd73O23ipmtBEajw9vzmbQfLhItObYzq7uyFJp95T6TMNwuFYigDISTucMUYbihIJwkO2u 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/msg00483.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 0b1d771..13eaa5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-09-24 Sanjoy Das + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2012-09-22 Yao Qi * remote.c (remote_get_trace_status): Remove setting default diff --git a/gdb/jit.c b/gdb/jit.c index 9e8f295..eff2ed6 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