From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 40BF63857C65 for ; Tue, 30 Jan 2024 12:11:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40BF63857C65 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 40BF63857C65 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616748; cv=none; b=BZRF7ITTiUZCFlJBbOp+jdmgHngQaxup62AbUdltxZlrhg3pz18xhGHcliXVrCWXF11/VNvIck3yW0qgy5mycTR7HjA2PENl94cXRDHkI7ToyAr6HMh4m1Yzb4JTGGnXBJRrJHk4LW4iWgTwvHxFCf5XuvcAEMqtKiO9MEtTdBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616748; c=relaxed/simple; bh=SmYWCNOh62qQLiYJos6SzaJp5FTuQvoVPlirWor1HJ0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=i9td1XMRZYFYz94QlxVO/aIU84Q/ME3BoKJWTrBrJX1QBo/VxjZ6mik6CVsf6ah4TUie38HH7HhFfjIZS/asJiLJaUXJxANV9dfOze3WRM7Omc5hhcj1Kk7n7p+p3k4ajJaZEJhMTKXn18cNCAbW9LoX3n3zaY7YIfRZRD5aPRU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33ae3be1c37so1527151f8f.0 for ; Tue, 30 Jan 2024 04:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616705; x=1707221505; 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=1BUHStVa7bCrP5affO7AgJPGu/x7+mpr7WEi5uG/BCo=; b=NYpjlj7AOfRoM7csvD6331QJ1cNiQFWWjCmm5KCYzO+gWqHLoUYcp3H8ODTtAXajc7 sXdGGNi3Fd+DU0RN1sGUwv52c2rPAYH7lrtNtarJ+R0JPQ6Ty2ozHLI7W9YNUDn3OgJd 0vGtVi1qFztDOiqjI/KEjMjIlRB1AyH1YEbD4KCYP/HDxr3esDeV+bY0oIBsAwj6cuRg ca0em+D94VAZBiQPoY8wsGp+mVeSS1xNUIlSB5eA/GO5UgwfmqyQv+G5ZlfLzbxAbz6G Lqh9n6zLw19O6ZlRXSYP+pkWHZWgt/KK1HMA7YlEqyUBPdfAyl00WLyWN2+METa9bu8l InVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616705; x=1707221505; 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=1BUHStVa7bCrP5affO7AgJPGu/x7+mpr7WEi5uG/BCo=; b=eMfCANwefRLSA6SvGlg8kEjYA08KrPgKqMgVsPflnJV82Vm/O4ruCLzp2man8x5aCN r/5vIrjxcMQ5/fHH6yv9K6KuThISEEU7jm+jHfq/HgkulT2QXu/iVmY7iVp/SAO6q6dG n2brzTsUPgl0hVKSH00NtUtQrOxA0QI74/4A9Ox9pjSWiJKYNgpnXvr7xjkrJwTv4Nf/ e2zWItEeJBOPJPv9b3/6iNWr4cnT+Qtu+aMR77iIfV63K9twoHFY7enpw4VV0OxssN3g XFcAQBdNTbRwbzt+gjTML9vkqriqX6/Ofl5kfXBgUf43okHN2eawlSvaSy4IdSKnjTq3 5tOw== X-Gm-Message-State: AOJu0YxUe7uQ4U7Yhrwxshdbe0mpT1CHuWR0ZfdH7FxoTVsr9CvYMa7S oSKQqIt/2LDfuNBzTdbcl1aUohtqZw4x2nSK9zE+rBnk4kaFgU+Fuhn/x41pPQ== X-Google-Smtp-Source: AGHT+IEHvfnGI7L9Tfy0W1QeiuSclYvXubf/1qdResRqHXwC06qacbjqj0D/sd5iJ5fvBTJBcY8w1Q== X-Received: by 2002:a5d:640d:0:b0:33a:ded0:c309 with SMTP id z13-20020a5d640d000000b0033aded0c309mr1324318wru.13.1706616705290; Tue, 30 Jan 2024 04:11:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:44 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 075/101] gccrs: TyTy: refactor to new API Date: Tue, 30 Jan 2024 13:07:31 +0100 Message-ID: <20240130121026.807464-78-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=unavailable 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: * typecheck/rust-hir-type-check-type.cc (TypeCheckType::resolve_root_path): Refactor. Signed-off-by: Jakub Dupak --- gcc/rust/typecheck/rust-hir-type-check-type.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.cc b/gcc/rust/typecheck/rust-hir-type-check-type.cc index 62a17769c3f..951920138cb 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-type.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-type.cc @@ -442,14 +442,9 @@ TypeCheckType::resolve_root_path (HIR::TypePath &path, size_t *offset, root_tyty = lookup; // this enforces the proper get_segments checks to take place - bool is_adt = root_tyty->get_kind () == TyTy::TypeKind::ADT; - if (is_adt) - { - const TyTy::ADTType &adt - = *static_cast (root_tyty); - if (adt.is_enum ()) - return root_tyty; - } + auto *maybe_adt = root_tyty->try_as (); + if (maybe_adt && maybe_adt->is_enum ()) + return root_tyty; } return root_tyty; -- 2.42.1