From patchwork Wed Feb 27 20:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 31643 Received: (qmail 85630 invoked by alias); 27 Feb 2019 20:06:06 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 85608 invoked by uid 89); 27 Feb 2019 20:06:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.142.138) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Feb 2019 20:06:04 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 7AF858080A for ; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id itq2oxMQ63iQ; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 3BE3E807DD; Wed, 27 Feb 2019 15:00:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 3BE3E807DD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1551297638; bh=wyP+vNGaoZIjGfJ0z+aYMZQKP1D5FvGg0g46VNTey/M=; h=From:To:Date:Message-Id:MIME-Version; b=RsB/YvY/H82t4f1SxWIOKU53XeTWIrdGRRCJRiV8hLPuoAaWbV+avYOjaG2s/2vB5 rIOAypzWJRQdf/MO657HskleFx/BW0VSSNjLRtqGzA+eywEwQ+umGQCvqzomBI/7Qh lkUBQ3/t7xKsHT7XORAuIM0pyuza9byClWxZCIAFpYgfUsmg7qpW1C1b354zlX08/x ItHYRAwRt7r2wxZdZB0/NaUvLHlc+Ak7GaxUdLkW78BieOzQJ0UC722v7sfeJzW/jr N0RHydtyv2EqM7UfwGg8NFA+qF3TVZQEefUXYx1bZTSfy+goXlTFlKIsRD8YgxQsqI Z4G4PDFQivKUQ== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id F2FBxtAJXE-p; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-157-41.qc.cable.ebox.net [192.222.157.41]) by mail.efficios.com (Postfix) with ESMTPSA id 1C3FB807CA; Wed, 27 Feb 2019 15:00:38 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 05/13] Split rank_one_type_parm_enum from rank_one_type Date: Wed, 27 Feb 2019 15:00:20 -0500 Message-Id: <20190227200028.27360-6-simon.marchi@efficios.com> In-Reply-To: <20190227200028.27360-1-simon.marchi@efficios.com> References: <20190227200028.27360-1-simon.marchi@efficios.com> MIME-Version: 1.0 gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_enum): New function extracted from... (rank_one_type): ... this. --- gdb/gdbtypes.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 237969532b..a0874b3d7d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4001,6 +4001,28 @@ rank_one_type_parm_int (struct type *parm, struct type *arg, struct value *value } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_ENUM. */ + +static struct rank +rank_one_type_parm_enum (struct type *parm, struct type *arg, struct value *value) +{ + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_INT: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + case TYPE_CODE_ENUM: + if (TYPE_DECLARED_CLASS (parm) || TYPE_DECLARED_CLASS (arg)) + return INCOMPATIBLE_TYPE_BADNESS; + return INTEGER_CONVERSION_BADNESS; + case TYPE_CODE_FLT: + return INT_FLOAT_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } +} + /* Compare one type (PARM) for compatibility with another (ARG). * PARM is intended to be the parameter type of a function; and * ARG is the supplied argument's type. This function tests if @@ -4099,22 +4121,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_INT: return rank_one_type_parm_int (parm, arg, value); case TYPE_CODE_ENUM: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - if (TYPE_DECLARED_CLASS (parm) || TYPE_DECLARED_CLASS (arg)) - return INCOMPATIBLE_TYPE_BADNESS; - return INTEGER_CONVERSION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_enum (parm, arg, value); case TYPE_CODE_CHAR: switch (TYPE_CODE (arg)) {