* [PATCH v2] c++: Use in-process client when networking is disabled
@ 2022-11-03 9:37 Torbjörn SVENSSON
2022-11-03 13:13 ` Nathan Sidwell
0 siblings, 1 reply; 5+ messages in thread
From: Torbjörn SVENSSON @ 2022-11-03 9:37 UTC (permalink / raw)
To: gcc-patches; +Cc: nathan, yvan.roux, Torbjörn SVENSSON
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 <yvan.roux@foss.st.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
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";
#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" }
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] c++: Use in-process client when networking is disabled
2022-11-03 9:37 [PATCH v2] c++: Use in-process client when networking is disabled Torbjörn SVENSSON
@ 2022-11-03 13:13 ` Nathan Sidwell
2022-11-03 13:48 ` Torbjorn SVENSSON
0 siblings, 1 reply; 5+ messages in thread
From: Nathan Sidwell @ 2022-11-03 13:13 UTC (permalink / raw)
To: Torbjörn SVENSSON, gcc-patches; +Cc: yvan.roux
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 <yvan.roux@foss.st.com>
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
> ---
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] c++: Use in-process client when networking is disabled
2022-11-03 13:13 ` Nathan Sidwell
@ 2022-11-03 13:48 ` Torbjorn SVENSSON
2022-11-03 14:09 ` Nathan Sidwell
0 siblings, 1 reply; 5+ messages in thread
From: Torbjorn SVENSSON @ 2022-11-03 13:48 UTC (permalink / raw)
To: Nathan Sidwell, gcc-patches; +Cc: yvan.roux
Hello Nathan,
On 2022-11-03 14:13, Nathan Sidwell wrote:
> 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 <yvan.roux@foss.st.com>
>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
>> ---
>> 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?
Ok for trunk if I change to just "disabled" here and in the other places
below?
Kind regards,
Torbjörn
>
>> #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" }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] c++: Use in-process client when networking is disabled
2022-11-03 13:48 ` Torbjorn SVENSSON
@ 2022-11-03 14:09 ` Nathan Sidwell
2022-11-04 7:57 ` Torbjorn SVENSSON
0 siblings, 1 reply; 5+ messages in thread
From: Nathan Sidwell @ 2022-11-03 14:09 UTC (permalink / raw)
To: Torbjorn SVENSSON, gcc-patches; +Cc: yvan.roux
On 11/3/22 09:48, Torbjorn SVENSSON wrote:
> Hello Nathan,
>
> On 2022-11-03 14:13, Nathan Sidwell wrote:
>> 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 <yvan.roux@foss.st.com>
>>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
>>> ---
>>> 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?
>
> Ok for trunk if I change to just "disabled" here and in the other places below?
yes, thanks
>
> Kind regards,
> Torbjörn
>
>>
>>> #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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] c++: Use in-process client when networking is disabled
2022-11-03 14:09 ` Nathan Sidwell
@ 2022-11-04 7:57 ` Torbjorn SVENSSON
0 siblings, 0 replies; 5+ messages in thread
From: Torbjorn SVENSSON @ 2022-11-04 7:57 UTC (permalink / raw)
To: Nathan Sidwell, gcc-patches; +Cc: yvan.roux
On 2022-11-03 15:09, Nathan Sidwell wrote:
> On 11/3/22 09:48, Torbjorn SVENSSON wrote:
>> Hello Nathan,
>>
>> On 2022-11-03 14:13, Nathan Sidwell wrote:
>>> 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 <yvan.roux@foss.st.com>
>>>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
>>>> ---
>>>> 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?
>>
>> Ok for trunk if I change to just "disabled" here and in the other
>> places below?
>
> yes, thanks
>>
>> Kind regards,
>> Torbjörn
>>
>>>
>>>> #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" }
>>>
>
Pushed.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-04 7:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-03 9:37 [PATCH v2] c++: Use in-process client when networking is disabled Torbjörn SVENSSON
2022-11-03 13:13 ` Nathan Sidwell
2022-11-03 13:48 ` Torbjorn SVENSSON
2022-11-03 14:09 ` Nathan Sidwell
2022-11-04 7:57 ` Torbjorn SVENSSON
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).