From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id B1A1438582B0 for ; Tue, 30 Jan 2024 12:12:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B1A1438582B0 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B1A1438582B0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616776; cv=none; b=Am+9802+v6SPFpGbdN/bLG+pH1AVPUyA/KcnQPaAwKf4HvO3ChQAmhENlyeLSidybkvbd/nwEUHQJegC9Iq/c50sK/JtYdwo+43Eb/6Tu8hYUM8/hn2sGraPDfhaJ5SPS9VJJtDOgi8eKSDWx07dln79pJZkeoLITqgrgf+hXPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616776; c=relaxed/simple; bh=GYFIXQqA76iGlkyus+RoxHBsrq0N7RaEQ+AYtrO+nKY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vCXrN2bvjvj0wVcFVbyMFj1dPSUEo8K+nvFcASMnAk8qbiNfooG5BxR/QEvLaw8RfS/N9k/5UHDOKom4XohJUC/ruU1lmQyfnmzFyOeCgA1RUeONFk4DK5lzlcSw1A/IS0ec1+qHd6c1aAgvO4x64uYyvkR7KlUkFH0HiDcjawk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-33af4a0beb3so1013008f8f.2 for ; Tue, 30 Jan 2024 04:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616718; x=1707221518; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=fWctQIQWuXNo2W2D7XmPH/C4uTQo2S8lFrAjloL8E0E=; b=CxDKtrRkF4HPAHtM983TjwtfGyK0GeHbnjkHV32n+Gl8vWxo7+BKO1EsCHR9PKMQQ8 4+LhT0X6Owxo5bOhu+CBvNfkSs5EvEuU5eNkxfMFroNyVwEPvsNEg/fc//N6WjGWhEyP GYbsxRHrRm3PTPthFf2AIzspVROnzBt/YINJCMTRlrcmvuBFP+r137mkMhwJMU25cG9d lFiOn4tLHOdmFWuvdetxedmsYyS0cGnZujUWgzu7GE2wGACW6CtPfgml99PzqIJNA+pA 2Irrywteze2rJ4jgJ3mmXBmCVqLehXURX+aWqd7Bq271LURTTVex9bWCIY2KG1e6w56T 3q5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616718; x=1707221518; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fWctQIQWuXNo2W2D7XmPH/C4uTQo2S8lFrAjloL8E0E=; b=A5ia+MOCF1iMdijdcO/rDeIEVYMiI4hNlfCz8+cVKbhe6VbqAeIQABcICEiv5FZ92+ IyU/AQOR1q9okSBqPSwcFbXkjAPTmmnTlhz8/XnCoRuZwxOKRbCx0mpH62tdjv/L3WPS mi0mch0SWd65cgTXCzbxlC2ys62ubR7coNan0VQ7sKEKoRcFHV8ZNAPd+kcNWZJ/ejeR 0HE3LM/COpn3/K9yB/qVKmTmkzDcwSP7rFiBFNAvBkp85Du1/Uj4KeUTJcL3Ojh9x8mj 4Ya++KR7tORJsCvgCWxFBhDmVx3o/qK2FRLB4F6Y5ncYFc8WygG0XOTi65+nRgOjmRqc 6gdw== X-Gm-Message-State: AOJu0YyknjSaJf/6vkEdfZV6uR+MCeC6e8IEMMseTVZmz+45Hn9a6mSB i3EBvzJkRyusMwalLeekAmI64g2yWByhGza7iTtjZ2wR/gqGBSaR7e4bURDsCbNkEEKup46pNwY pCg== X-Google-Smtp-Source: AGHT+IGlZcXKFyn/6dPiMcoJEzmGq8XdHZebK/ihl6Atv49/4VMB76GwljCfiD8yD6/f/kFiJocvpw== X-Received: by 2002:a05:6000:78d:b0:33a:f681:699e with SMTP id bu13-20020a056000078d00b0033af681699emr1883574wrb.21.1706616718560; Tue, 30 Jan 2024 04:11:58 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:58 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 097/101] gccrs: AST: Fix for lifetime lowering Date: Tue, 30 Jan 2024 13:07:53 +0100 Message-ID: <20240130121026.807464-100-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.2 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 List-Id: From: Jakub Dupak gcc/rust/ChangeLog: * hir/rust-ast-lower-type.cc (ASTLoweringTypeBounds::visit): fix for lifetimes (ASTLowerWhereClauseItem::visit): fix for lifetimes Signed-off-by: Jakub Dupak --- gcc/rust/hir/rust-ast-lower-type.cc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-type.cc b/gcc/rust/hir/rust-ast-lower-type.cc index a0178ebf490..504ca051f59 100644 --- a/gcc/rust/hir/rust-ast-lower-type.cc +++ b/gcc/rust/hir/rust-ast-lower-type.cc @@ -529,8 +529,13 @@ ASTLoweringTypeBounds::translate (AST::TypeParamBound *type) void ASTLoweringTypeBounds::visit (AST::TraitBound &bound) { - // FIXME - std::vector lifetimes; + std::vector for_lifetimes; + for (auto &lifetime_param : bound.get_for_lifetimes ()) + { + auto generic_param = ASTLowerGenericParam::translate (&lifetime_param); + for_lifetimes.push_back ( + *static_cast (generic_param)); + } AST::TypePath &ast_trait_path = bound.get_type_path (); HIR::TypePath *trait_path = ASTLowerTypePath::translate (ast_trait_path); @@ -543,8 +548,9 @@ ASTLoweringTypeBounds::visit (AST::TraitBound &bound) BoundPolarity polarity = bound.has_opening_question_mark () ? BoundPolarity::AntiBound : BoundPolarity::RegularBound; - translated = new HIR::TraitBound (mapping, *trait_path, bound.get_locus (), - bound.is_in_parens (), polarity); + translated + = new HIR::TraitBound (mapping, *trait_path, bound.get_locus (), + bound.is_in_parens (), polarity, for_lifetimes); } void @@ -596,6 +602,13 @@ ASTLowerWhereClauseItem::visit (AST::TypeBoundWhereClauseItem &item) // FIXME std::vector for_lifetimes; + for (auto &lifetime_param : item.get_for_lifetimes ()) + { + auto generic_param = ASTLowerGenericParam::translate (&lifetime_param); + for_lifetimes.push_back ( + *static_cast (generic_param)); + } + std::unique_ptr bound_type = std::unique_ptr ( ASTLoweringType::translate (item.get_type ().get ())); -- 2.42.1