From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 97BAF38845FB for ; Tue, 7 Jun 2022 15:18:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97BAF38845FB Received: by mail-il1-x135.google.com with SMTP id y17so14440594ilj.11 for ; Tue, 07 Jun 2022 08:18:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=O7te9h/uFxeOJiMpxXovlM2NwLsPJwSXuPZv6or5H54=; b=2QXet0lWJKa53yd2CVxgxd40iI90D/8UI1GgCYDXsJvb6ldJxm0kl/A6DhVrDK73Y1 Ydy2nOAMDZpuieGlkMZYNB+zG2/SAKtycia5ghz0nHUgB56EMUZnRYpV9hzWShes2pxB KyznVs9ypy1kxiPaxyUIvw1cLxM+/flHLj31DubO05dSyi6PJsbMUQ57O6kemZqEU2Zx pi1KOK1RSiki7PrEvGSqKFwCwMk5gR7Qe5D/OJ35TA3rJSULJpIgwbzPGhot/GzZ5kJv IhPdrORrlrQUTWEKrxCbLmrs7mdbJZRvWmf59FXxLXuaW+2J62VM0xwDiITWzfYNL8/d 5QKA== X-Gm-Message-State: AOAM5327EHlwciqulApC9RR5BiRyKN1BjVGxX2qygBN59nNgUhoypSed r8HFCslzVVVCfBbKxBgEX60o9Z71IU5vxQ== X-Google-Smtp-Source: ABdhPJyJ0GZCo8rjlOnxOH2CHSvGmi8Kt+TYFx7RagRdYpwvbg1/163iEEuvdbTTTkO61NatkXWplw== X-Received: by 2002:a05:6e02:1607:b0:2d1:e622:3f0a with SMTP id t7-20020a056e02160700b002d1e6223f0amr17048075ilu.287.1654615130747; Tue, 07 Jun 2022 08:18:50 -0700 (PDT) Received: from murgatroyd.Home (71-211-171-143.hlrn.qwest.net. [71.211.171.143]) by smtp.gmail.com with ESMTPSA id m8-20020a0566380dc800b00331e38ccc4asm166997jaj.51.2022.06.07.08.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 08:18:49 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use PyBool_FromLong Date: Tue, 7 Jun 2022 09:18:46 -0600 Message-Id: <20220607151846.2267356-1-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2022 15:18:53 -0000 I noticed a few spots that were explicitly creating new references to Py_True or Py_False. It's simpler here to use PyBool_FromLong, so this patch changes all the places I found. --- gdb/python/py-cmd.c | 3 +-- gdb/python/py-symbol.c | 3 +-- gdb/python/py-type.c | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index f80318374d3..5cc392af175 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -128,8 +128,7 @@ cmdpy_function (const char *args, int from_tty, cmd_list_element *command) error (_("Could not convert arguments to Python string.")); } - gdbpy_ref<> ttyobj - = gdbpy_ref<>::new_reference (from_tty ? Py_True : Py_False); + gdbpy_ref<> ttyobj (PyBool_FromLong (from_tty)); gdbpy_ref<> result (PyObject_CallMethodObjArgs ((PyObject *) obj, invoke_cst, argobj.get (), ttyobj.get (), NULL)); diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 02c35acd1e9..23495b66d42 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -426,8 +426,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) } PyTuple_SET_ITEM (ret_tuple.get (), 0, sym_obj); - bool_obj = (is_a_field_of_this.type != NULL) ? Py_True : Py_False; - Py_INCREF (bool_obj); + bool_obj = PyBool_FromLong (is_a_field_of_this.type != NULL); PyTuple_SET_ITEM (ret_tuple.get (), 1, bool_obj); return ret_tuple.release (); diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c index 5352ead84bd..0e772ad44b4 100644 --- a/gdb/python/py-type.c +++ b/gdb/python/py-type.c @@ -220,14 +220,12 @@ convert_field (struct type *type, int field) if (PyObject_SetAttrString (result.get (), "name", arg.get ()) < 0) return NULL; - arg = gdbpy_ref<>::new_reference (TYPE_FIELD_ARTIFICIAL (type, field) - ? Py_True : Py_False); + arg.reset (PyBool_FromLong (TYPE_FIELD_ARTIFICIAL (type, field))); if (PyObject_SetAttrString (result.get (), "artificial", arg.get ()) < 0) return NULL; if (type->code () == TYPE_CODE_STRUCT) - arg = gdbpy_ref<>::new_reference (field < TYPE_N_BASECLASSES (type) - ? Py_True : Py_False); + arg.reset (PyBool_FromLong (field < TYPE_N_BASECLASSES (type))); else arg = gdbpy_ref<>::new_reference (Py_False); if (PyObject_SetAttrString (result.get (), "is_base_class", arg.get ()) < 0) -- 2.34.1