From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id A982438582A1 for ; Wed, 7 Feb 2024 12:44:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A982438582A1 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 A982438582A1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309862; cv=none; b=FtG3PsLSBpm71N4FPyKoU2ptAQlH4GPLTeUnrBZNepqupKmnasHVC+AqQoE+Txawf3GRKZ8gbvCZ9q4LtH1w+QHCUm38Y0VFdDA5Tlr3ls/vr0DXIpx3aW+5e1Hi/fJ5Xb8Gk0VBai6L2hB1d3HjRm655OP2/VYzDSbVY+fqKV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309862; c=relaxed/simple; bh=Y87feO7Zvpa7AUiPI0qkgfuC+NuJFL9HNIDC2zR4W4s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=gKhgIB5ZpNlMF58h4TEDpf5mrzPZwcKTKkBWNPetM/GvcY5qM9PkNzLi96Ksc6SrBd/0RFZxhTkP3OZW/rLQQm2Y/PZP9c59F9lRAU7rS92INyl7A8B88X0yf4teW33YaSMKj4GwzqOp0qdy/U+c1b0d1DIEQFwseRahZDPNjbo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40f02b8d176so4809375e9.1 for ; Wed, 07 Feb 2024 04:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309852; x=1707914652; 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=QpFcSii0x7VBtidrQYPvIjRrzKOg4eZf6x+G1FDSSMg=; b=LwJsNX9DpnEgX3ppAaoIARe++YJ1TEJETgYRCbiOfymGFMea8SLhrf0OYtCQindCNR AQu4twcSnddbht4YhvzPzhxKaPoXnoRIV98ufIGt0QBQXdi601Wv4mZT55YAhKlVIvH7 CQtBhDMm9hDtEAqvw7gpSoJdK99lNdsj+xccdgID7UnzlUJm0XNJDVpk8luQqTxV1vjD 6J3lrN4xSnTm6qttyEWqx+ey99AnRXE+NZI2KLAr8S5DY219osXsN5G7QS53b7JSSmSw Hb0+0BDd7EabXBXLUnk7XOOds3NpE7c/PFLoNhQQYGV/OhglixxPufri896v726crJVl ax4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309852; x=1707914652; 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=QpFcSii0x7VBtidrQYPvIjRrzKOg4eZf6x+G1FDSSMg=; b=o+vtMt7193xBF0GRwAcr8FCKiU8xBz4/w5aX2QytKVuuFTZb3gLRxYS6hQWK7ZKnU0 UuD2eq68Mi8QCzcP50+MyBzXYIezAiPDUlsuuJh5thrZkDnz431CpWECnf0SVcvJ5XfI Y8hcZgL6QDYXsLPdyNXRLKxJy0EvjSTgUjrm9q//a13amQdO7lbOc1yqePhG3nkaTRZ3 P5Hn0N2iCn0+dfaGqureRt0lu9DckLudQwJ3MzZQ+Y9kFnNpeDNs5H9RwO5OkwKfQlDr nF0WRNG5iQ/OSPuhJzQGiKAnzWi+disZlxRFnmuNEKc842dmt6h2cPMHjmSqr12CXqof gGIg== X-Gm-Message-State: AOJu0YxwVs+OU6eRqnYT4hMZ7rIMPoi35+BoWI29Ln3bkxocxRDxq4DP /PGeoQSwMyrFb6mrOm4s0LNmSHcF/x656Q4geYDd7f65bOcvVOfL4nnpHN606w== X-Google-Smtp-Source: AGHT+IGodsrZs0tEa7vh+x5pL9HzzVUJ69Yqighhd5JasGEdDbrcPs0i2DlIwooXdIIVVb2ucZ2vcA== X-Received: by 2002:a05:600c:4588:b0:40e:cdff:8d10 with SMTP id r8-20020a05600c458800b0040ecdff8d10mr4390597wmo.6.1707309852486; Wed, 07 Feb 2024 04:44:12 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU5kHd01Wi091T0IEGgrk3IoDtmbPTzhQKqDie+5ROP3NI45xZBQKptqZwS216CDAxu+Rwwze7cfuyTkJNGln45ot4BBrj5xytJ9yFU Received: from platypus.sou.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id x19-20020a05600c2a5300b0040fbdd6f69bsm5044188wme.33.2024.02.07.04.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:44:11 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED 14/25] gccrs: remove similar hack in type paths as we had in path expressions Date: Wed, 7 Feb 2024 12:44:00 +0100 Message-ID: <20240207114419.1100894-15-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240207114419.1100894-2-arthur.cohen@embecosm.com> References: <20240207114419.1100894-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 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: Philip Herron This keeps the resolution code in line with paths. Addresses #2723 gcc/rust/ChangeLog: * typecheck/rust-hir-type-check-type.cc: remove hack --- gcc/rust/typecheck/rust-hir-type-check-type.cc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.cc b/gcc/rust/typecheck/rust-hir-type-check-type.cc index 0d108c3959c..74a12c4b011 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-type.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-type.cc @@ -572,22 +572,6 @@ TypeCheckType::resolve_segments ( } context->insert_receiver (expr_mappings.get_hirid (), prev_segment); - if (tyseg->needs_generic_substitutions ()) - { - // location_t locus = segments.back ()->get_locus (); - if (!prev_segment->needs_generic_substitutions ()) - { - auto used_args_in_prev_segment - = GetUsedSubstArgs::From (prev_segment); - if (!used_args_in_prev_segment.is_error ()) - tyseg - = SubstMapperInternal::Resolve (tyseg, used_args_in_prev_segment); - } - - if (tyseg->get_kind () == TyTy::TypeKind::ERROR) - return new TyTy::ErrorType (expr_id); - } - rust_assert (resolved_node_id != UNKNOWN_NODEID); // lookup if the name resolver was able to canonically resolve this or not -- 2.42.1