From patchwork Thu Nov 30 10:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 81013 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3E26E38618BA for ; Thu, 30 Nov 2023 10:20:21 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id C7A9D3857C41 for ; Thu, 30 Nov 2023 10:19:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C7A9D3857C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C7A9D3857C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::435 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701339558; cv=none; b=RkspQNtjrKZGI2IYcZM3dAquurHMIs19TEDWnzfI3LLcHr4Zt5/9pzA7psOw0NPKtwH0PpZiSnNd8bW4JfixPCwvBwNKpZRGaVCLU1mLfr91/GdZZBoTf/M85BEhSfs6IzLmNmwczOZOf5hfjcAQCZBnXubwZMjLVPMHkDi+HE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701339558; c=relaxed/simple; bh=9ICX1EGOE7n2JsDE5F2tf4QwjES40uGKu1vuLxcuIeM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=uMqV25NKWvQcpAVJ4OsdBT0mBRwc1o+cECqKRsyfycyreyjAB8v7RT57oGrF+E/TBeawOzGf0ofJpl2DOj25bZ4jrWd1BuIdoLfZSnYoD/7gV8XhEUd72AGmFYanRUz3Db5m5kjXSVxDTT2ZtmtG/Slp3xZnmbASyoB6mw2JJL0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3331974c2ceso518982f8f.0 for ; Thu, 30 Nov 2023 02:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1701339555; x=1701944355; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y6dZFeAwKsQUVEbcM238xSaSiey09GQT1zpBY9AhMQc=; b=VhUgO7mZr9bGzk3KeNtYhKHXLm7RyfGSYjMzlnaJzCpOzzl3nKEb1RN5eOok1Xp4xU 1gs5KeHpv5lV6QF0HYE/TmBlSF8pNy7SyrL+2rd0OIg2JDjThv5wC3EJb7AvMq3bxu5c ehA5xZV0RNv039CB3YA21VTCdsMQmrDSLl91xaQTQRMLtqh5Cksxo9tkOPsefvkDsu8v tFpP0cn0bpWt0gt1Lc80ozbDMuWnLufl5wj98wYUGlr3zXV0/tO10PILAnMe6jEZq1qk AuoA9BsbKBhpEttFYF6GYdqf73Ax18XzsrAiEIt5KWZAOWOmoGWKAqQGFPm4qRmIgNf3 Lzgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339555; x=1701944355; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y6dZFeAwKsQUVEbcM238xSaSiey09GQT1zpBY9AhMQc=; b=IVgPHOkra8hB6tAtRl3mvlDMCREypgdpaeI0fnZL0qyOIAak7kxsnBqkk0duKcZx73 X75gELjYABr8gHiaZRnrT4d9PqMibGz1emk3fwjsrNnSBhHcciPb4ILDXnGA8S+w4USk tULlsOiI3NOfMObTDtjH1AybTFmknXpkGMz7G/n2LCjwj3tXbMGa0w7q34cUFmrs6tam RhThMUuwd5i7rf71y2Q7Dt4I23nDvYevJnFM0eTqV3w/MsIqDrDtDtsula9OJmFjFBzh GaWWuoHWqpXccC+HAXepqwIRhCRvR5MDIN4NYDQnIvNSEoh3WnlNExkZEPdVD+OwL1c9 sXUw== X-Gm-Message-State: AOJu0YxbP9bAdtbLsuvlZ5+n2gcnp/P/ET7WYNe7wRowBeB0VJ8W8nAm Vw1GH3wE82SAbeby7Qy7nK6BbOTdGKF4rJ02jxwjrw== X-Google-Smtp-Source: AGHT+IHwrgvoypsUI4stUZBJee5a8Gje82Tf3ZxqDs3aethoVOBdXUtHcY2VtIOSxtCnFpE85SgkWg== X-Received: by 2002:a5d:4b83:0:b0:332:eeba:ee8b with SMTP id b3-20020a5d4b83000000b00332eebaee8bmr10634660wrt.24.1701339555570; Thu, 30 Nov 2023 02:19:15 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id z1-20020a5d4d01000000b00332ce0d7300sm1115984wrt.92.2023.11.30.02.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:19:15 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Sheri Bernstein Subject: [COMMITTED] ada: Remove GNATcheck violations Date: Thu, 30 Nov 2023 11:19:14 +0100 Message-ID: <20231130101914.3094378-1-poulhies@adacore.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org From: Sheri Bernstein Remove GNATcheck violations by refactoring code and also using pragma Annotate to exempt them. gcc/ada/ * libgnat/i-cstrin.adb (Free): Rewrite code so there is only one return, to remove Improper_Returns violation. (Position_Of_Nul): Add pragma to exempt Improper_Returns violation. (To_Chars_Ptr): Likewise. (Value): Likewise Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/i-cstrin.adb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gcc/ada/libgnat/i-cstrin.adb b/gcc/ada/libgnat/i-cstrin.adb index afbac727e31..1eb28655004 100644 --- a/gcc/ada/libgnat/i-cstrin.adb +++ b/gcc/ada/libgnat/i-cstrin.adb @@ -92,12 +92,10 @@ is procedure Free (Item : in out chars_ptr) is begin - if Item = Null_Ptr then - return; + if Item /= Null_Ptr then + Memory_Free (Item); + Item := Null_Ptr; end if; - - Memory_Free (Item); - Item := Null_Ptr; end Free; -------------------- @@ -187,6 +185,8 @@ is function Position_Of_Nul (Into : char_array) return size_t is begin + pragma Annotate (Gnatcheck, Exempt_On, "Improper_Returns", + "early returns for performance"); for J in Into'Range loop if Into (J) = nul then return J; @@ -194,6 +194,8 @@ is end loop; return Into'Last + 1; + + pragma Annotate (Gnatcheck, Exempt_Off, "Improper_Returns"); end Position_Of_Nul; ------------ @@ -226,6 +228,8 @@ is Nul_Check : Boolean := False) return chars_ptr is begin + pragma Annotate (Gnatcheck, Exempt_On, "Improper_Returns", + "early returns for performance"); if Item = null then return Null_Ptr; elsif Nul_Check @@ -235,6 +239,8 @@ is else return To_chars_ptr (Item (Item'First)'Address); end if; + + pragma Annotate (Gnatcheck, Exempt_Off, "Improper_Returns"); end To_Chars_Ptr; ------------ @@ -302,6 +308,8 @@ is Length : size_t) return char_array is begin + pragma Annotate (Gnatcheck, Exempt_On, "Improper_Returns", + "early returns for performance"); if Item = Null_Ptr then raise Dereference_Error; end if; @@ -328,6 +336,8 @@ is return Result; end; + + pragma Annotate (Gnatcheck, Exempt_Off, "Improper_Returns"); end Value; function Value (Item : chars_ptr) return String is @@ -339,6 +349,8 @@ is Result : char_array (0 .. Length); begin + pragma Annotate (Gnatcheck, Exempt_On, "Improper_Returns", + "early returns for performance"); -- As per AI-00177, this is equivalent to: -- To_Ada (Value (Item, Length) & nul); @@ -357,6 +369,8 @@ is Result (Length) := nul; return To_Ada (Result); + + pragma Annotate (Gnatcheck, Exempt_Off, "Improper_Returns"); end Value; end Interfaces.C.Strings;