From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 997F4383FF64 for ; Wed, 14 Dec 2022 10:28:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 997F4383FF64 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671013722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0rdOBxZtL9kzQz+RY0SVGPhvgfQbz4Z5BBgzstZhlsA=; b=RBC4vtgjdk8u4BGD6mDlGt/+ygzMNbT2RsBOFCP4pFIGK1Uz5Qw0BoKycK8Jye854dQIOK GBoYk8Y/w02NfTBNo8cSpI7mxJ3+CH1UUxe6LWKc8up3zvvHuwuuDTSSfhl0FXFRF05QVm U9O2EFrKQgziB1spAPBej7Eu9RN60lM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-378-GWJgf4yPMNu9rHEWurKTbQ-1; Wed, 14 Dec 2022 05:28:41 -0500 X-MC-Unique: GWJgf4yPMNu9rHEWurKTbQ-1 Received: by mail-wm1-f72.google.com with SMTP id c126-20020a1c3584000000b003cfffcf7c1aso7035408wma.0 for ; Wed, 14 Dec 2022 02:28:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0rdOBxZtL9kzQz+RY0SVGPhvgfQbz4Z5BBgzstZhlsA=; b=N0s45h2kOtztDuWtV/2wWm5rXQpmYDultBgMWnbH61UYMe+I74LXroHzhGiqFKe8y2 iuj5idINAVVls98Jvpf8o1bP6aCYla7WWxFH9V55x8awdeYL99CWLv99ePah+pFm0+/A kFQg1zOO3NrpmDO+Hqsjzc0Qs4p2TqiH6JwimtkTKs93N0HWPHJGUzfhXHIghNZsK1zB IDveOM6sI0jixp3/FAlOMn3HGEM9+aciPpqZNz+9hOqyK8hz8BS96LPFH04hMgD2iCR4 NaEWEV6JonFSNJ4O0iuQAcjOu6c8Wn+b5qb40ZF1kgKAC87/RGxQY8ccBB8jmwbugigR hHCQ== X-Gm-Message-State: ANoB5plnKE7pgXYSfBJX4vL+9caYgIOSOYUz7zqWpFSjgb454pHbeV/b OSiDa+P4IlyOQh5rJXauIHxK9TNWglKbQ0nZMIObs2A89EhWzdsEDb5ycHVyQpDvEeuQlRmKdtt yR0y+M6ZwSVYndQ/2PjPl+LO4x1BeEmXM67L9CxKTnpvsajtncfMVpbSjIHKsw892rL1tapB49Q == X-Received: by 2002:a05:600c:3592:b0:3d0:1b21:597 with SMTP id p18-20020a05600c359200b003d01b210597mr18160065wmq.1.1671013719867; Wed, 14 Dec 2022 02:28:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf4dO/xqOQVQkelMuPN246Zp0n/SHCAd+bqZTTlHKymljCBv7tZj6SFWe8F6xJWo/83+azqkVQ== X-Received: by 2002:a05:600c:3592:b0:3d0:1b21:597 with SMTP id p18-20020a05600c359200b003d01b210597mr18160053wmq.1.1671013719623; Wed, 14 Dec 2022 02:28:39 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id c6-20020a05600c0a4600b003d1e3b1624dsm2402126wmq.2.2022.12.14.02.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 02:28:39 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 1/2] gdb: use gdb_assert not internal_error Date: Wed, 14 Dec 2022 10:28:32 +0000 Message-Id: <7de91e1876385d0b1d025f3ef4c7cd10bc3f1a2e.1671013621.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Spotted a couple of places in findvar.c where we use: if ( ! CONDITION ) internal_error ("..."); this commit changes these to be: gdb_assert ( CONDITION ); which I think is better. Unless we happen to hit the internal_error calls (which was bad) there should be no user visible changes after this commit. --- gdb/findvar.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gdb/findvar.c b/gdb/findvar.c index 91de3fd5c3e..e609358df08 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -152,10 +152,7 @@ extract_long_unsigned_integer (const gdb_byte *addr, int orig_len, CORE_ADDR extract_typed_address (const gdb_byte *buf, struct type *type) { - if (!type->is_pointer_or_reference ()) - internal_error (_("extract_typed_address: " - "type is not a pointer or reference")); - + gdb_assert (type->is_pointer_or_reference ()); return gdbarch_pointer_to_address (type->arch (), type, buf); } @@ -204,10 +201,7 @@ template void store_integer (gdb_byte *addr, int len, void store_typed_address (gdb_byte *buf, struct type *type, CORE_ADDR addr) { - if (!type->is_pointer_or_reference ()) - internal_error (_("store_typed_address: " - "type is not a pointer or reference")); - + gdb_assert (type->is_pointer_or_reference ()); gdbarch_address_to_pointer (type->arch (), type, buf, addr); } -- 2.25.4