Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C47EC2BB1D for ; Mon, 16 Mar 2020 10:04:56 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 00EDA2051A for ; Mon, 16 Mar 2020 10:04:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JGOlDPp5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00EDA2051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BB37E89033; Mon, 16 Mar 2020 10:04:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yQeTLHMU00LR; Mon, 16 Mar 2020 10:04:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 51C1C88672; Mon, 16 Mar 2020 10:04:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3E921C1D7C; Mon, 16 Mar 2020 10:04:55 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id D6B2CC013E for ; Mon, 16 Mar 2020 10:04:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CD69187B57 for ; Mon, 16 Mar 2020 10:04:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ti1hzCwDJiGj for ; Mon, 16 Mar 2020 10:04:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 74DA687269 for ; Mon, 16 Mar 2020 10:04:53 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id m15so7682386pje.3 for ; Mon, 16 Mar 2020 03:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CW/aBVc/DvLm5AzOCaIeJv4ugR2BHIZSwBinzT7AqF0=; b=JGOlDPp54GAwTqVhVkFWnZesLL1cvRrat9MVlcAXDnyy0RHuiZf1o+siqitRRy2ySS GESgMbtBQn2e11Fk00Z5qUE+z+IjUq0BoaplWP/ZYfPfQTIMhUmEaWmaxzXaCofUleDW Fj1OPM0aeflhhiT3Y2u5dS0cYkoeqna02y4xSwd/yT+eN56A+RfBdZ2FB2sNQLoSR2f4 Fvq74PUbIEaIfS5bKP2pk/RE5oH8x7/CTCIgWqkpRH2Pj2DrrWoQ+jUwJVjEo9Gae0P4 q0EhlpWgNX40nA0gaVp35q2QSkR8PhQuG9ZBGAbfrMVdEUgIxKYP2lrKa9xGnOEfgbg+ FIeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CW/aBVc/DvLm5AzOCaIeJv4ugR2BHIZSwBinzT7AqF0=; b=FNgPqsN4JWo71VpZWHtVLVNcVOZfoVvExH9B6POD0JFJXLBiBXkINQkitFUfhXqX3X jr57T/I3l1lvecaQMR2t7959TaelxcJghOqKUSjFvVX/F/YQfQiw65KvmjJXFakT2RKd iXZivuDBM1GIczwUdzwSXrEfx5Vo7Fc50F6KB2pSlqYJOICPc7JW3HmitCq1gra//1PB QwQSP4riBkWQ1JAROAX5Qx/4xVr7P1pMTOfbxUDqsJVNIcKY0BTLCIWQ/U9UcfYc2FEV nKaI2ow5s6oTTA78TNyNfrvqUVJ9O0s7LCW7u+HcpY7lODuAIgMhif+7p2Qq+cUlYIva oE9w== X-Gm-Message-State: ANhLgQ2QjbCyCVMSrkbR5NT7aRdeNPInUV0CXbi468rE6FddwlI1bV9Q GPgml5vgp5OXW7ItKjkNdM4= X-Google-Smtp-Source: ADFU+vtJsmax0DwQC+Cf9NjJglYaRBWbACQoic2tLn6yf66YW/uZVM0OuXW3/yAdCegbFry1bM5ujw== X-Received: by 2002:a17:90a:a791:: with SMTP id f17mr8620356pjq.22.1584353092970; Mon, 16 Mar 2020 03:04:52 -0700 (PDT) Received: from localhost.localdomain ([2405:204:284:a4f2:cc63:b7fc:551c:dce5]) by smtp.gmail.com with ESMTPSA id u3sm19803374pjv.32.2020.03.16.03.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:04:52 -0700 (PDT) From: Jaskaran Singh To: cocci@systeme.lip6.fr Date: Mon, 16 Mar 2020 15:33:16 +0530 Message-Id: <20200316100319.27935-24-jaskaransingh7654321@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200316100319.27935-1-jaskaransingh7654321@gmail.com> References: <20200316100319.27935-1-jaskaransingh7654321@gmail.com> MIME-Version: 1.0 Cc: julia.lawall@inria.fr, Jaskaran Singh , linux-kernel-mentees@lists.linuxfoundation.org Subject: [Linux-kernel-mentees] [PATCH 23/26] engine: Match A.ParenType and A.FunctionType X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" ParenType and FunctionType are added to the SmPL AST as types. Match these types correctly. Signed-off-by: Jaskaran Singh --- engine/check_exhaustive_pattern.ml | 2 ++ engine/cocci_vs_c.ml | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/engine/check_exhaustive_pattern.ml b/engine/check_exhaustive_pattern.ml index 5a047f73..872c060c 100644 --- a/engine/check_exhaustive_pattern.ml +++ b/engine/check_exhaustive_pattern.ml @@ -149,6 +149,8 @@ let dumb_astcocci_type = function | A.SignedT (signa,tya) -> () | A.Pointer (typa, _) -> () | A.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) -> () + | A.ParenType(lp,ty,rp) -> () + | A.FunctionType(ty,lp,params,rp) -> () | A.Array (typa, _, eaopt, _) -> () | A.Decimal(_, _, _, _, _, _) -> () | A.EnumName(en, ena) -> () diff --git a/engine/cocci_vs_c.ml b/engine/cocci_vs_c.ml index a4a0e53b..3e0eb50e 100644 --- a/engine/cocci_vs_c.ml +++ b/engine/cocci_vs_c.ml @@ -3785,6 +3785,29 @@ and (typeC: (A.typeC, Ast_c.typeC) matcher) = | _ -> fail ) + | A.ParenType (lpa, typa, rpa), (B.ParenType typb, ii) -> + let (lpb, rpb) = tuple_of_list2 ii in + fullType typa typb >>= (fun typa typb -> + tokenf lpa lpb >>= (fun lpa lpb -> + tokenf rpa rpb >>= (fun rpa rpb -> + return ( + (A.ParenType (lpa, typa, rpa)) +> A.rewrap ta, + (B.ParenType (typb), [lpb;rpb]) + )))) + + | A.FunctionType (typa, lpa, paramsa, rpa), + (B.FunctionType (typb, (paramsb, (isvaargs, iidotsb))), ii) -> + let (lpb, rpb) = tuple_of_list2 ii in + fullType typa typb >>= (fun typa typb -> + tokenf lpa lpb >>= (fun lpa lpb -> + tokenf rpa rpb >>= (fun rpa rpb -> + parameters (seqstyle paramsa) (A.unwrap paramsa) paramsb >>= + (fun paramsaunwrap paramsb -> + let paramsa = A.rewrap paramsa paramsaunwrap in + return ( + (A.FunctionType (typa, lpa, paramsa, rpa)) +> A.rewrap ta, + (B.FunctionType (typb, (paramsb, (isvaargs, iidotsb))), [lpb;rpb]) + ))))) (* todo: handle the iso on optional size specification ? *) @@ -4361,6 +4384,10 @@ and compatible_typeC a (b,local) = | A.FunctionPointer (a, _, _, _, _, _, _), _ -> failwith "TODO: function pointer type doesn't store enough information to determine compatibility" + | A.ParenType (_, a, _), (qub, (B.ParenType b, ii)) -> + compatible_type a (b, local) + | A.FunctionType (a, _, _, _), (qub, (B.FunctionType (b,_), ii)) -> + compatible_type a (b, local) | A.Array (a, _, _, _), (qub, (B.Array (eopt, b),ii)) -> (* no size info for cocci *) compatible_type a (b, local) -- 2.21.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees