From patchwork Sun Apr 13 16:23:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 338768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8978E14008A for ; Mon, 14 Apr 2014 02:25:05 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=ZpFJRj4kw3dWaqq9vm8hKgvEeOaB4wc2FGK4K8knrTI CM9auL04VZ0UPoHGrmVcgA37vgg9zetUSDsvpqvK7UgJGqpvmPebKTZgMegWoxXG s8/CwFPfV3GTs8nOoA7ISkdfQEYJdzkc41ADPT3VgKiKXznbhXAe+UOm/LXw265Q = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=FAE/rHcvuOK3EwFrYct9pw+LSXY=; b=STn2AQ663ML5SPaxh IFn1Yj6Wsh4s7EXbWw1SaWNR00ygl3sLRW3CsgK6GpvAGwgmlSFzBDTIyCX3HPdI mNmqqKsJ7cfQ4ASZIZvQoWaKGSc0YxUGyMowtrUlA7yhwk+R0iFgWwh56bl4enec 9tLb2PHZYbOYi1seig8/7NPXY8= Received: (qmail 30474 invoked by alias); 13 Apr 2014 16:24:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 30465 invoked by uid 89); 13 Apr 2014 16:24:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: userp1040.oracle.com Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sun, 13 Apr 2014 16:24:56 +0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s3DGOsgW021284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Apr 2014 16:24:55 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s3DGOrV2022765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Apr 2014 16:24:54 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userz7022.oracle.com (8.14.5+Sun/8.14.4) with ESMTP id s3DGOrpN016828; Sun, 13 Apr 2014 16:24:53 GMT Received: from [192.168.1.4] (/79.33.216.254) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 13 Apr 2014 09:24:53 -0700 Message-ID: <534AB9FA.2000606@oracle.com> Date: Sun, 13 Apr 2014 18:23:22 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: [C++ Patch] Mini pt.c tweak X-IsSubscribed: yes Hi, tested x86_64-linux. Thanks, Paolo. ///////////////////// 2014-04-13 Paolo Carlini * pt.c (mark_template_parm): Use template_parm_level_and_index. Index: pt.c =================================================================== --- pt.c (revision 209339) +++ pt.c (working copy) @@ -4028,16 +4028,7 @@ mark_template_parm (tree t, void* data) int idx; struct template_parm_data* tpd = (struct template_parm_data*) data; - if (TREE_CODE (t) == TEMPLATE_PARM_INDEX) - { - level = TEMPLATE_PARM_LEVEL (t); - idx = TEMPLATE_PARM_IDX (t); - } - else - { - level = TEMPLATE_TYPE_LEVEL (t); - idx = TEMPLATE_TYPE_IDX (t); - } + template_parm_level_and_index (t, &level, &idx); if (level == tpd->level) {