From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5359 invoked by alias); 3 Apr 2014 19:09:39 -0000 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 Received: (qmail 5344 invoked by uid 89); 3 Apr 2014 19:09:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qa0-f74.google.com Received: from mail-qa0-f74.google.com (HELO mail-qa0-f74.google.com) (209.85.216.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 03 Apr 2014 19:09:37 +0000 Received: by mail-qa0-f74.google.com with SMTP id w5so415450qac.5 for ; Thu, 03 Apr 2014 12:09:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-type; bh=plhEWs4Me1p/RI76ou7KeK7JJ53q9TdOhaENOgsMKAw=; b=Lk/7Fj1hMtJA8vYFwIshTkGdYIVJqCy55ZT0/aZtS6/uNpJp9X4sz5YOONdc0X5Z6r wrm72yEN6hAnfEAnnyH0i7NfZX3V9BFQ0lVSPoHIbgkBNndzS667pZwdE38l1+AYE5G1 8Eykp58Jy0kCAZV1ZADdk13UKxVlsKmtJMpx7eEZevfhQ+yfQ3Y8kfPK7BdsEf3e07oQ MehnRsjoplLKD9dSjEx0pcJO03NvKrirNwhh4bmDwM0AelAI7kN853fv7S7Yb6Qy9WIJ P/3FuVEcv6thGJKtqPRiqfCtJHCXkjQ7UFMf/i/KYBJFgP5V0PrUWlVq1xW6971WlsaU rRag== X-Gm-Message-State: ALoCoQmWeFFzg2DnP8I/RKkmDgB2n8tXmeq5wiwVDm/8jEWCHL2vmZK+Ay6nVyvJ0YzfyLo6pQVV1fKHIFCe7RlMP1dqMwa6AjuO4OgKphT7yvR/iqfQkz7djOSfrJjQKyzN4kVwHeSMZILcNjiXmCQMWDpvoKmGfspZx/051ikg70EhpVyPBUp4uAspo5YvvAAkya6OCwQfOUlJMmw/YK0r67aa11yg3fzjN/xoHg9lvuwmhlVnvnA= X-Received: by 10.58.168.137 with SMTP id zw9mr799362veb.15.1396552174973; Thu, 03 Apr 2014 12:09:34 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id i30si1143598yhc.0.2014.04.03.12.09.34 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Apr 2014 12:09:34 -0700 (PDT) Received: from ruffy.mtv.corp.google.com (ruffy.mtv.corp.google.com [172.17.128.44]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 8E72C5A41B9 for ; Thu, 3 Apr 2014 12:09:34 -0700 (PDT) From: Doug Evans To: gdb-patches@sourceware.org Subject: [commit] (read_cutu_die_from_dwo): Fix assertion Date: Thu, 03 Apr 2014 19:09:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-IsSubscribed: yes X-SW-Source: 2014-04/txt/msg00050.txt.bz2 Hi. Thinko on my part, checked in as obvious. 2014-04-03 Doug Evans * dwarf2read.c (read_cutu_die_from_dwo): Fix assertion, at most one of stub_comp_unit_die, stub_comp_dir is non-NULL. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 3e77cf8..103219c 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -4977,8 +4977,8 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu, struct attribute *attr; struct die_info *comp_unit_die; - /* Exactly one of these must be provided. */ - gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) == 1); + /* At most one of these may be provided. */ + gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) <= 1); /* These attributes aren't processed until later: DW_AT_stmt_list, DW_AT_low_pc, DW_AT_high_pc, DW_AT_ranges.