From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by sourceware.org (Postfix) with ESMTPS id ED05E3858D39 for ; Thu, 3 Nov 2022 13:13:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED05E3858D39 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-qk1-x72b.google.com with SMTP id g10so1038929qkl.6 for ; Thu, 03 Nov 2022 06:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=R8nZYBNJzoW9FEQdX1hvGiDysZMkEtaYayybne6Zmuc=; b=NxY3tF06LS0RYVr+TXepNi382fzFoDY9Wee5XWHLBUUOyXGJuiF4idOKsh5/Ydl7c3 AYF/mPHGP50H13ZrwQDvpLmYMf/08N3oZmAKHcFG6cPyZGNsMaVtoD6ifur6+d/KSm60 knKlVCY95WbWgS3OohdBN7H//NOA1bCJnHl5um5ErlypPpc08GeqPpidLIunj79kCowI UkIZhaXU4OmoKkLoxAoPg4UJTk/Cpky2GZStsBZGV/TDZWc5scoGkdKfhTXk/cFm1SXw FVlogq26oRWvcPuvUreqID5w9LfaYgObN3lknacGA9XGodVQlKe2J1mDJdd+CDaRltFF otWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R8nZYBNJzoW9FEQdX1hvGiDysZMkEtaYayybne6Zmuc=; b=EnCuEuIDt2+4e/UIWzhV15KrB9mv8S3BZLlRSdR/TyPjKR44n4uSJIKdiEIWSqDO0c 1BWMkBsCcESvDAt1Ljy5v/3DZ1wW1UHfZG75Mf25+4WmtveapmN0p8QH5k3X5TimMuEF awvd/c1YdJ+rvDdcWWDsQ/XqSaD4SBq9ZmtlvbDXVWKXMypjUurJoJipT8DIq4D2W13r duiSNTW+KNskaXG3CrIhe74zIfJMD7ck3xv0PLgTJ6zOD/FPQ4oJh1BmIJqPUBwQRwOv AkwnGmd9F4aGf8dIY4k6KXzuNXhXbHvZYBtfnUYm1dF8z7Gab5F//Yv95Zpi4N+9aqqx p9yg== X-Gm-Message-State: ACrzQf23D7jWpyPulEkJFplwla10g7CtNCrUmvAJdL/f4oshZeBo+cvy Q0XDjTU0inWbJzWFIB2YBzA= X-Google-Smtp-Source: AMsMyM7NqGbY5SGWVbAbtpKPYJ+X7/dTpYHwbGcwz3whj7mk1YmKTZLTT7YHMy7VLTKQQgIu9TCnYg== X-Received: by 2002:a05:620a:1007:b0:6fa:1ee5:d7b8 with SMTP id z7-20020a05620a100700b006fa1ee5d7b8mr18829477qkj.645.1667481194972; Thu, 03 Nov 2022 06:13:14 -0700 (PDT) Received: from ?IPV6:2601:19c:527f:bfd0::5? ([2601:19c:527f:bfd0::5]) by smtp.googlemail.com with ESMTPSA id t22-20020a05620a451600b006f87d28ea3asm732933qkp.54.2022.11.03.06.13.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Nov 2022 06:13:14 -0700 (PDT) Sender: Nathan Sidwell Message-ID: <700a9410-c69d-93da-5975-69cae5db33db@acm.org> Date: Thu, 3 Nov 2022 09:13:13 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: [PATCH v2] c++: Use in-process client when networking is disabled To: =?UTF-8?Q?Torbj=c3=b6rn_SVENSSON?= , gcc-patches@gcc.gnu.org Cc: yvan.roux@foss.st.com References: <20221103093748.2671754-1-torbjorn.svensson@foss.st.com> Content-Language: en-US From: Nathan Sidwell In-Reply-To: <20221103093748.2671754-1-torbjorn.svensson@foss.st.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3038.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP 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: On 11/3/22 05:37, Torbjörn SVENSSON wrote: > v1 -> v2: > Updated expression in bad-mapper-3.C > > Ok for trunk? > > --- > > Without the patch, the output for bad-mapper-3.C would be: > > /src/gcc/gcc/testsuite/g++.dg/modules/bad-mapper-3.C:2:1: error: unknown Compiled Module Interface: no such module > > As this line is unexpected, the test case would fail. > The same problem can also be seen for g++.dg/modules/bad-mapper-2.C. > > gcc/cp/ChangeLog: > > * mapper-client.cc: Use in-process client when networking is > disabled. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/bad-mapper-3.C: Update dg-error pattern. > > Tested on Windows with arm-none-eabi for Cortex-M3 in gcc-11 tree. > > Co-Authored-By: Yvan ROUX > Signed-off-by: Torbjörn SVENSSON > --- > gcc/cp/mapper-client.cc | 4 ++++ > gcc/testsuite/g++.dg/modules/bad-mapper-3.C | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/gcc/cp/mapper-client.cc b/gcc/cp/mapper-client.cc > index fe9544b5ba4..4dcb3a03660 100644 > --- a/gcc/cp/mapper-client.cc > +++ b/gcc/cp/mapper-client.cc > @@ -227,6 +227,8 @@ module_client::open_module_client (location_t loc, const char *o, > int fd = -1; > #if CODY_NETWORKING > fd = Cody::OpenLocal (&errmsg, name.c_str () + 1); > +#else > + errmsg = "CODY_NETWORKING disabled"; CODY_NETWORKING is implementor speak. I think just "disabled" is sufficient here? > #endif > if (fd >= 0) > c = new module_client (fd, fd); > @@ -254,6 +256,8 @@ module_client::open_module_client (location_t loc, const char *o, > int fd = -1; > #if CODY_NETWORKING > fd = Cody::OpenInet6 (&errmsg, name.c_str (), port); > +#else > + errmsg = "CODY_NETWORKING disabled"; > #endif > name[colon] = ':'; > > diff --git a/gcc/testsuite/g++.dg/modules/bad-mapper-3.C b/gcc/testsuite/g++.dg/modules/bad-mapper-3.C > index 9dab332ccb2..c91bb4e260c 100644 > --- a/gcc/testsuite/g++.dg/modules/bad-mapper-3.C > +++ b/gcc/testsuite/g++.dg/modules/bad-mapper-3.C > @@ -1,6 +1,6 @@ > // { dg-additional-options "-fmodules-ts -fmodule-mapper=localhost:172477262" } > import unique3.bob; > -// { dg-error {failed connecting mapper 'localhost:172477262'} "" { target *-*-* } 0 } > +// { dg-error {failed (connecting|CODY_NETWORKING disabled) mapper 'localhost:172477262'} "" { target *-*-* } 0 } > // { dg-prune-output "fatal error:" } > // { dg-prune-output "failed to read" } > // { dg-prune-output "compilation terminated" } -- Nathan Sidwell