From patchwork Wed Feb 27 20:00:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 31645 Received: (qmail 85729 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 85605 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 645CB80898 for ; Wed, 27 Feb 2019 15:00:40 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id 1ch28ImCZNBL; Wed, 27 Feb 2019 15:00:40 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 6658F807FA; Wed, 27 Feb 2019 15:00:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 6658F807FA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1551297638; bh=yqUvbzzT9+5GEO8b1Svpjg5X/GC6ZXE2iLrJm30QflQ=; h=From:To:Date:Message-Id:MIME-Version; b=AvYxMuVawIvss6Rw0OGZwYBbCAXwt6/gJjrOtTw9tGk/ERFIiXobJOSgMm4jUCG1E +Nh2o1QkY49zW6248NNkqVIo/bq6by5KVQoO29MukiPCGHyLLSKsu/ArdfoFCfa603 MkNPT8MPx1e2yzbWbviK8M+aqiwmUDERZlQgsLETVHQ8+JtPlvB4ZtIgMYf9gWQV9S aUo5nzJuuWplJxrGf54hv4ZC0TvvD59HSmpMqcT0bVKOJz4NMJP96QRHzKE5w4GStd IfsXtH16PI+/+RzVArwf7ZDG/iU1z6iqJfqsMjfgTlT9p08W/zZRMM/u8Fym5G7GXK juMJUAjYOiLnw== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id TD-NYkkK3Uvx; 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 49DA5807E1; Wed, 27 Feb 2019 15:00:38 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 07/13] Split rank_one_type_parm_range from rank_one_type Date: Wed, 27 Feb 2019 15:00:22 -0500 Message-Id: <20190227200028.27360-8-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_range): New function extracted from... (rank_one_type): ... this. --- gdb/gdbtypes.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index daf3261e9b..9c4c66d44d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4070,6 +4070,26 @@ rank_one_type_parm_char (struct type *parm, struct type *arg, struct value *valu } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_RANGE. */ + +static struct rank +rank_one_type_parm_range (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: + 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 @@ -4172,20 +4192,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_CHAR: return rank_one_type_parm_char (parm, arg, value); case TYPE_CODE_RANGE: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - return INTEGER_CONVERSION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_range (parm, arg, value); case TYPE_CODE_BOOL: switch (TYPE_CODE (arg)) {