From patchwork Wed Feb 7 11:44:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 197905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2201698dyb; Wed, 7 Feb 2024 04:49:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IECf2/sIKBLBnTQ/W0bpiO4ZQ28FLo2ztTYMRXtT4keHAcb2+9xS+ETkHV8IFge3vvIU0nA X-Received: by 2002:ac8:7ca9:0:b0:42b:f020:f36e with SMTP id z9-20020ac87ca9000000b0042bf020f36emr4848862qtv.59.1707310146547; Wed, 07 Feb 2024 04:49:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707310146; cv=pass; d=google.com; s=arc-20160816; b=MA5kmMyaOH4ZDOlYHc4qKPsftAnd5yv1QF7T39J4J1ViG3MPrgfTf4t3pOqYYoPZV3 FLqvk0YoBAt8FoQ4vbhDh6LxRej0aMZUlmfBrAPv8/0M1T2hEmsLJAFwADGCviWkKiQ4 dhjgtq13lkaqnPbtlRIzkzIkfDlFyMvY40o3QkcK7D/u+Inw/n1wCMcpc9Sh5OPKdDQZ VSNp/l5EFjnQBZfQbpJWCQOs9Vm7ZeK0emVFTPH+X04gHhWV8mbxwSXWnWqkLRgsx3AN 3+iWR93mDJ1zKGbu/ufWLWsPY8Qb0iMXSRm/X4QKVpuyPCRq1JAzldJawwKZhuCDnp26 Xx2g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=JTPWczjXRLl4YXHpDiGew11D6mj2E3TIj9ZOPf8yTgE=; fh=FNr0QHaBmd2rKmzzNsatqni7VHieZ2qy/fxK3mVGFQ0=; b=lyTG6AWBbj3LynMrXZJm41xuHIJA0jP2+NuBjsiL6yT8vV4crRgjhxf0UHOsxzhzWl mBIdTC0G8F6n/NT+BaCFMS0IDQejVmWf27u8ohrAuTs9t6ijzPVH//in2TJbewS1SKfj CQXlc95uJMCWCzZEpfgpGj4TjdhUH0qZixZU7gFiB6L8KXaxholt+1nmsJ0+QJtMSwIZ eWAIrn692TWEkWWgC6nBdnEq06vIwZ92qtVT47j2X3UwfG23SUHRF6O8/mg0Px052DEh JKWd8t7UhhAYj40NPhDa/0L5iPMwlpX5INKNbRa44aZim9Da41rGW7z2KQL0w7eLvdKF J9ew==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=FuUa0Ksf; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" X-Forwarded-Encrypted: i=2; AJvYcCXYgyFVH8CyQ9qSKw5sTZsfC0rjzKgoOXz61jqs3yqdBGXRndB8XzEj4Tknc/IihSAwqgXPtrEfHKrnyEiMeusluADtiA== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u21-20020a05622a199500b0042c44923b31si326146qtc.597.2024.02.07.04.49.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:49:06 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=FuUa0Ksf; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F18D63857C7C for ; Wed, 7 Feb 2024 12:49:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 197BE385841D for ; Wed, 7 Feb 2024 12:44:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 197BE385841D 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 197BE385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309864; cv=none; b=G/BZ7e9+W4BwrSsVRh/+mPgoPSLG/rIf1DrxbQ71lIkFaWZUr/6uQ8/gkOkF7fgzZSzXg5Bdooh6bLithSrIZXivpWZAwJb0Amd8AK8F6w+E7FYSQphg7uZG/pflJQsAnrsU6VngtvMiYqm4yzpiiUKk+fOwByKD0xjoZddtbSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309864; c=relaxed/simple; bh=ppmQGMf5cSqwXh8+CjzRQKocSVijK0/FRHgD/uQ02C4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Cbq2IkVA1CH66eCk8X/xlfuvn9ANq+4BCyl7gyRCS7umFlL2/fgTkdwPy0ls2XY+dIVoB9XP3Xo49yxvXcBiUd7cl7PTMYKkqWMGx4kQl5K7to0rVXw4QGcW6wt4UlpW4XftiDofUqILI8oBMh+yjeLekmRC5eXmKBJlQBviBOQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40fe3141e1cso5520625e9.0 for ; Wed, 07 Feb 2024 04:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309853; x=1707914653; 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=JTPWczjXRLl4YXHpDiGew11D6mj2E3TIj9ZOPf8yTgE=; b=FuUa0Ksfze9DyxLeiE9FZKCad9jk0md0BwVUzll/q0pl7RnzZdtOjOuLu3qibrns4V py9VayR6SJZ5//jC5lWoIgkbu+gOKxrxdBHcIo+N21InAUJIMWIXIkqW6TLzGTXp7EFP 8NqnuGRrmt1MSUBoh88CQX3Bpgoh5U+8FqwzbrXU0Z7f7iYTsv9fC0qG5XZQaoV2LfLO 7bJm/84wAPsgX0I/NtkjxUBo0gRSJByUhdDfm6RZjaIla/JjDSBx03dCcZUULk+aiVbS YKKsrFVVKxFQyVsdpa1n+GGfOgVnk4WR5WQEFGMrx2tgTMjkJ1ZU9BHKtoI47Q3wT6wx v/1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309853; x=1707914653; 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=JTPWczjXRLl4YXHpDiGew11D6mj2E3TIj9ZOPf8yTgE=; b=FsmcNgaK+hoNTASC05joN7mGMY7NlJ311qsIm7pSLEtNnYMUg5yykEEGvXMPlNd8Sp Zqs29Cd8wFDQ86N2Et+jNtfzYm3pOyTqM3taG0MO27AJ3hn8usQLAOU04/nvQmmD14Oz drgYWCkmdo/74FVuekWDriz1YUFniI8fqoDCs4cgr+ZtND1TFH1s46ESVw2m2/OBt4BN s3xgRI5ojQjghdiGR6MJahZIDmTaLLXNQmmJNwkc1ehORHUr31+y9eb2RY/ETOH4GlEH 11w+RaH/XATFMKSPoIpIWtzS1J8FRBB9Mbg4zIayXeO5fX6oJFFZ8Gge80k+j850FyMf AuZQ== X-Gm-Message-State: AOJu0Yzxx48AVJ4be3R8GXu9uILrfkp3ADasApcckNC/xHUKTm9iGlqH 4TwHgdAfhQKmlCwNHW/A9CM+JNEZL3Za/27iYyHaT6nZY36Ce9gjwozxru6R+8HwEyKgUYtDkxe lNw== X-Received: by 2002:a05:600c:a39c:b0:40f:b283:bb00 with SMTP id hn28-20020a05600ca39c00b0040fb283bb00mr3887786wmb.18.1707309853174; Wed, 07 Feb 2024 04:44:13 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXqxTdA9p3SyW8f5HdJKNd9y5NVIDqVnVbmGzUssTCk0zc0+2x/47oS5pjRGtw4KuLpaB5pzlURBp/ihRLfcsjO992HExrfTk/qcDjf 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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:44:12 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED 15/25] gccrs: refactor inference variable computation into a seperate method Date: Wed, 7 Feb 2024 12:44:01 +0100 Message-ID: <20240207114419.1100894-16-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> MIME-Version: 1.0 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, KAM_SHORT, 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 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: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790244443914708236 X-GMAIL-MSGID: 1790244443914708236 From: Philip Herron gcc/rust/ChangeLog: * typecheck/rust-hir-type-check.cc (TypeResolution::Resolve): refactor * typecheck/rust-hir-type-check.h: new prototype * typecheck/rust-typecheck-context.cc (TypeCheckContext::compute_inference_variables): x --- gcc/rust/typecheck/rust-hir-type-check.cc | 34 +--------------- gcc/rust/typecheck/rust-hir-type-check.h | 2 + gcc/rust/typecheck/rust-typecheck-context.cc | 41 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check.cc b/gcc/rust/typecheck/rust-hir-type-check.cc index 2b7868685d4..0bc72d3f73f 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.cc +++ b/gcc/rust/typecheck/rust-hir-type-check.cc @@ -76,40 +76,8 @@ TypeResolution::Resolve (HIR::Crate &crate) if (saw_errors ()) return; - auto mappings = Analysis::Mappings::get (); auto context = TypeCheckContext::get (); - - // default inference variables if possible - context->iterate ([&] (HirId id, TyTy::BaseType *ty) mutable -> bool { - // nothing to do - if (ty->get_kind () != TyTy::TypeKind::INFER) - return true; - - TyTy::InferType *infer_var = static_cast (ty); - TyTy::BaseType *default_type; - bool ok = infer_var->default_type (&default_type); - if (!ok) - { - rust_error_at (mappings->lookup_location (id), ErrorCode::E0282, - "type annotations needed"); - return true; - } - else - { - auto result - = unify_site (id, TyTy::TyWithLocation (ty), - TyTy::TyWithLocation (default_type), UNDEF_LOCATION); - rust_assert (result); - rust_assert (result->get_kind () != TyTy::TypeKind::ERROR); - result->set_ref (id); - context->insert_type ( - Analysis::NodeMapping (mappings->get_current_crate (), 0, id, - UNKNOWN_LOCAL_DEFID), - result); - } - - return true; - }); + context->compute_inference_variables (true); } // rust-hir-trait-ref.h diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h index 3d66e29052f..52c84fc4435 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.h +++ b/gcc/rust/typecheck/rust-hir-type-check.h @@ -231,6 +231,8 @@ public: WARN_UNUSED_RESULT std::vector regions_from_generic_args (const HIR::GenericArgs &args) const; + void compute_inference_variables (bool error); + private: TypeCheckContext (); diff --git a/gcc/rust/typecheck/rust-typecheck-context.cc b/gcc/rust/typecheck/rust-typecheck-context.cc index 1f4a5a35626..9059e0261b3 100644 --- a/gcc/rust/typecheck/rust-typecheck-context.cc +++ b/gcc/rust/typecheck/rust-typecheck-context.cc @@ -17,6 +17,7 @@ // . #include "rust-hir-type-check.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { @@ -576,6 +577,46 @@ TypeCheckContext::regions_from_generic_args (const HIR::GenericArgs &args) const return regions; } +void +TypeCheckContext::compute_inference_variables (bool error) +{ + auto mappings = Analysis::Mappings::get (); + + // default inference variables if possible + iterate ([&] (HirId id, TyTy::BaseType *ty) mutable -> bool { + // nothing to do + if (ty->get_kind () != TyTy::TypeKind::INFER) + return true; + + TyTy::InferType *infer_var = static_cast (ty); + TyTy::BaseType *default_type; + + rust_debug_loc (mappings->lookup_location (id), + "trying to default infer-var: %s", + infer_var->as_string ().c_str ()); + bool ok = infer_var->default_type (&default_type); + if (!ok) + { + if (error) + rust_error_at (mappings->lookup_location (id), ErrorCode::E0282, + "type annotations needed"); + return true; + } + + auto result + = unify_site (id, TyTy::TyWithLocation (ty), + TyTy::TyWithLocation (default_type), UNDEF_LOCATION); + rust_assert (result); + rust_assert (result->get_kind () != TyTy::TypeKind::ERROR); + result->set_ref (id); + insert_type (Analysis::NodeMapping (mappings->get_current_crate (), 0, id, + UNKNOWN_LOCAL_DEFID), + result); + + return true; + }); +} + // TypeCheckContextItem TypeCheckContextItem::Item::Item (HIR::Function *item) : item (item) {}