[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iverbin at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

Ilya Verbin <iverbin at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |iverbin at gmail dot com

--- Comment #1 from Ilya Verbin <iverbin at gmail dot com> ---
Oops, I removed strchrnul from mkoffload, but it remains in lto-wrapper.
I will fix it.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iains at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

Iain Sandoe <iains at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
   Last reconfirmed|                            |2014-11-13
     Ever confirmed|0                           |1

--- Comment #2 from Iain Sandoe <iains at gcc dot gnu.org> ---
it's also in gcc/gcc.c

(and breaks *darwin* at least)

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iains at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #3 from Iain Sandoe <iains at gcc dot gnu.org> ---

… does libiberty want an implementation?


const char * 
strchrnul (const char *s, int c)
{
  char *snew = strrchr(s, c);
  if (snew != NULL)
    return snew;
  return (s + strlen (s));
}
>From gcc-bugs-return-466672-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org Thu Nov 13 17:10:34 2014
Return-Path: <gcc-bugs-return-466672-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org>
Delivered-To: listarch-gcc-bugs@gcc.gnu.org
Received: (qmail 18254 invoked by alias); 13 Nov 2014 17:10:34 -0000
Mailing-List: contact gcc-bugs-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-bugs.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-help@gcc.gnu.org>
Sender: gcc-bugs-owner@gcc.gnu.org
Delivered-To: mailing list gcc-bugs@gcc.gnu.org
Received: (qmail 18153 invoked by uid 48); 13 Nov 2014 17:10:30 -0000
From: "jakub at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.
Date: Thu, 13 Nov 2014 17:10:00 -0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: bootstrap
X-Bugzilla-Version: 5.0
X-Bugzilla-Keywords:
X-Bugzilla-Severity: normal
X-Bugzilla-Who: jakub at gcc dot gnu.org
X-Bugzilla-Status: NEW
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags:
X-Bugzilla-Changed-Fields:
Message-ID: <bug-63853-4-tlhfIju7rZ@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-63853-4@http.gcc.gnu.org/bugzilla/>
References: <bug-63853-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-SW-Source: 2014-11/txt/msg01144.txt.bz2
Content-length: 236

https://gcc.gnu.org/bugzilla/show_bug.cgi?idc853

--- Comment #4 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
That is not what strchrnul does though.
If is char *p = strchr (s, c); if (p) return p; else return strchr (s, '\0');

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iverbin at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #5 from Ilya Verbin <iverbin at gmail dot com> ---
So, I'll implement strchrnul in libiberty, ok?

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[dje at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

David Edelsohn <dje at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dje at gcc dot gnu.org
               Host|                            |*-*-darwin*, *-*-aix*

--- Comment #6 from David Edelsohn <dje at gcc dot gnu.org> ---
strchrnul() is a GNU extension.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #7 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
I think it is more work than just changing the few spots.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iains at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #8 from Iain Sandoe <iains at gcc dot gnu.org> ---
(In reply to Jakub Jelinek from comment #4)
> That is not what strchrnul does though.
> If is char *p = strchr (s, c); if (p) return p; else return strchr (s, '\0');

fair enough, if that's preferred
 .. was just following the description from a random Linux man page:
http://linux.die.net/man/3/strchrnul

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[dominiq at lps dot ens.fr]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #9 from Dominique d'Humieres <dominiq at lps dot ens.fr> ---
I just completed a clean bootstrap of r217511 with the following patch

--- ../_clean/gcc/gcc.c    2014-11-13 15:29:00.000000000 +0100
+++ gcc/gcc.c    2014-11-13 17:59:47.000000000 +0100
@@ -3375,12 +3375,16 @@ handle_foffload_option (const char *arg)
   if (arg[0] == '-')
     return;

-  end = strchrnul (arg, '=');
+  end = strchr (arg, '=');
+  if (end == NULL)
+    end = strchr (arg, '\0');
   cur = arg;

   while (cur < end)
     {
-      next = strchrnul (cur, ',');
+      next = strchr (cur, ',');
+      if (next == NULL)
+    next = strchr (cur, '\0');
       next = (next > end) ? end : next;

       target = XNEWVEC (char, next - cur + 1);
@@ -3400,7 +3404,9 @@ handle_foffload_option (const char *arg)
       c = OFFLOAD_TARGETS;
       while (c)
     {
-      n = strchrnul (c, ',');
+      n = strchr (c, ',');
+      if (n == NULL)
+        n = strchr (c, '\0');

       if (strlen (target) == (size_t) (n - c)
           && strncmp (target, c, n - c) == 0)
@@ -3421,7 +3427,9 @@ handle_foffload_option (const char *arg)
       c = offload_targets;
       do
         {
-          n = strchrnul (c, ':');
+          n = strchr (c, ':');
+          if (n == NULL)
+        n = strchr (c, '\0');

           if (strlen (target) == (size_t) (n - c)
           && strncmp (c, target, n - c) == 0)
--- ../_clean/gcc/lto-wrapper.c    2014-11-13 15:29:00.000000000 +0100
+++ gcc/lto-wrapper.c    2014-11-13 17:54:48.000000000 +0100
@@ -424,7 +424,9 @@ parse_env_var (const char *str, char ***

   values = (char**) xmalloc (num * sizeof (char*));
   curval = str;
-  nextval = strchrnul (curval, ':');
+  nextval = strchr (curval, ':');
+  if (nextval == NULL)
+    nextval = strchr (curval, '\0');

   int append_len = append ? strlen (append) : 0;
   for (i = 0; i < num; i++)
@@ -436,7 +438,9 @@ parse_env_var (const char *str, char ***
       if (append)
     strcat (values[i], append);
       curval = nextval + 1;
-      nextval = strchrnul (curval, ':');
+      nextval = strchr (curval, ':');
+      if (nextval == NULL)
+    nextval = strchr (curval, '\0');
     }
   *pvalues = values;
   return num;
@@ -581,7 +585,9 @@ append_offload_options (obstack *argv_ob

       while (cur < opts)
         {
-          next = strchrnul (cur, ',');
+          next = strchr (cur, ',');
+          if (next == NULL)
+        next = strchr (cur, '\0');
           next = (next > opts) ? opts : next;

           if (strlen (target) == (size_t) (next - cur)

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[schwab@linux-m68k.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #10 from Andreas Schwab <schwab@linux-m68k.org> ---
How about using strcspn?

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[jakub at gcc dot gnu.org]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 6524 bytes --]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #11 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
(In reply to Dominique d'Humieres from comment #9)
> I just completed a clean bootstrap of r217511 with the following patch

This is ok for trunk so that we don't have bootstrap breakages for too long.

That said, most of the strchrnul uses look to me like completely unnecessary.

> --- ../_clean/gcc/gcc.c	2014-11-13 15:29:00.000000000 +0100
> +++ gcc/gcc.c	2014-11-13 17:59:47.000000000 +0100
> @@ -3375,12 +3375,16 @@ handle_foffload_option (const char *arg)
>    if (arg[0] == '-')
>      return;
>  
> -  end = strchrnul (arg, '=');
> +  end = strchr (arg, '=');
> +  if (end == NULL)
> +    end = strchr (arg, '\0');
>    cur = arg;
>  
>    while (cur < end)
>      {
> -      next = strchrnul (cur, ',');
> +      next = strchr (cur, ',');
> +      if (next == NULL)
> +	next = strchr (cur, '\0');

E.g. here.  If strchr (cur, ',') returns NULL, then what
strchr (cur, '\0'); returns is either equal to end, or > end, so we can just
set next = end;.

>        strncpy (target, cur, next - cur);

memcpy should be used instead.

> -	  n = strchrnul (c, ',');
> +	  n = strchr (c, ',');
> +	  if (n == NULL)
> +	    n = strchr (c, '\0');
>  
>  	  if (strlen (target) == (size_t) (n - c)

Here, strlen (target) should be known, isn't it next - cur ?
(and another spot with that).

Also,
  offload_targets = xstrdup (target);
(could have instead just set offload_targets = target;
and ensure it isn't freed, say by setting target = NULL).

And:
             offload_targets
                = XRESIZEVEC (char, offload_targets,
                              strlen (offload_targets) + strlen (target) + 2);
              if (strlen (offload_targets) != 0)
                strcat (offload_targets, ":");
              strcat (offload_targets, target);
Compute strlen (offload_targets) once, strlen (target) is known (next - cur),
and don't compute it 5 times instead.
              size_t offload_targets_len = strlen (offload_targets);
              offload_targets = XRESIZEVEC (char, offload_targets,
                                            offload_targets_len + (next - cur)
+ 2);
              if (offload_targets_len)
                offload_targets[offload_targets_len++] = ':';
              memcpy (offload_targets + offload_targets_len, target, next -
cur);
?  Especially if (strlen (offload_targets) != 0) is very expensive way of
if (*offload_targets)
The tree-ssa-strlen.c pass will presumably optimize some of this, but given
the conditional likely not all of that.

Sorry for not catching that during review.
s + strcspn (s, "=") instead of strchrnul (s, '=') is reasonable too.
>From gcc-bugs-return-466685-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org Thu Nov 13 19:00:09 2014
Return-Path: <gcc-bugs-return-466685-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org>
Delivered-To: listarch-gcc-bugs@gcc.gnu.org
Received: (qmail 5508 invoked by alias); 13 Nov 2014 19:00:08 -0000
Mailing-List: contact gcc-bugs-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-bugs.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-help@gcc.gnu.org>
Sender: gcc-bugs-owner@gcc.gnu.org
Delivered-To: mailing list gcc-bugs@gcc.gnu.org
Received: (qmail 5305 invoked by uid 48); 13 Nov 2014 19:00:00 -0000
From: "zsojka at seznam dot cz" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug sanitizer/63855] New: [5 Regression] ICE: SIGSEGV in ipa_comdats with -fsanitize=null
Date: Thu, 13 Nov 2014 19:00:00 -0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: new
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: sanitizer
X-Bugzilla-Version: 5.0
X-Bugzilla-Keywords:
X-Bugzilla-Severity: normal
X-Bugzilla-Who: zsojka at seznam dot cz
X-Bugzilla-Status: UNCONFIRMED
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags:
X-Bugzilla-Changed-Fields: bug_id short_desc product version bug_status bug_severity priority component assigned_to reporter cc attachments.created
Message-ID: <bug-63855-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-SW-Source: 2014-11/txt/msg01157.txt.bz2
Content-length: 1935

https://gcc.gnu.org/bugzilla/show_bug.cgi?idc855

            Bug ID: 63855
           Summary: [5 Regression] ICE: SIGSEGV in ipa_comdats with
                    -fsanitize=null
           Product: gcc
           Version: 5.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: sanitizer
          Assignee: unassigned at gcc dot gnu.org
          Reporter: zsojka at seznam dot cz
                CC: dodji at gcc dot gnu.org, dvyukov at gcc dot gnu.org,
                    jakub at gcc dot gnu.org, kcc at gcc dot gnu.org

Created attachment 33960
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id3960&actioníit
reduced testcase

$ gcc -O -fkeep-inline-functions -fsanitize=null testcase.C
="060== Invalid read of size 8
="060==    at 0x180E214: ipa_comdats (ipa-comdats.c:340)
="060==    by 0x180E214: (anonymous
namespace)::pass_ipa_comdats::execute(function*) (ipa-comdats.c:381)
="060==    by 0xCCBE78: execute_one_pass(opt_pass*) (passes.c:2269)
="060==    by 0xCCCAD1: execute_ipa_pass_list(opt_pass*) (passes.c:2663)
="060==    by 0x9B3B69: ipa_passes (cgraphunit.c:2088)
="060==    by 0x9B3B69: symbol_table::compile() (cgraphunit.c:2172)
="060==    by 0x9B5687: symbol_table::finalize_compilation_unit()
(cgraphunit.c:2325)
="060==    by 0x785449: cp_write_global_declarations() (decl2.c:4677)
="060==    by 0xDC3BD3: compile_file() (toplev.c:583)
="060==    by 0x694528: do_compile (toplev.c:2020)
="060==    by 0x694528: toplev::main(int, char**) (toplev.c:2117)
="060==    by 0x694B78: main (main.c:38)
="060==  Address 0x0 is not stack'd, malloc'd or (recently) free'd
="060=testcase.C:5:4: internal compiler error: Segmentation fault
 B b;
    ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.

Tested revisions:
r217458 - ICE
4_9 r216937 - OK

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iverbin at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #12 from iverbin at gcc dot gnu.org ---
Author: iverbin
Date: Thu Nov 13 22:06:15 2014
New Revision: 217524

URL: https://gcc.gnu.org/viewcvs?rev=217524&root=gcc&view=rev
Log:
2014-11-13  Dominique Dhumieres  <dominiq@lps.ens.fr>

    PR bootstrap/63853
gcc/
    * gcc.c (handle_foffload_option): Replace strchrnul with strchr.
    * lto-wrapper.c (parse_env_var, append_offload_options): Likewise.

Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/gcc.c
    trunk/gcc/lto-wrapper.c

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |build
           Priority|P3                          |P1
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED
   Target Milestone|---                         |5.0

--- Comment #13 from Richard Biener <rguenth at gcc dot gnu.org> ---
Fixed.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[dominiq at lps dot ens.fr]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #14 from Dominique d'Humieres <dominiq at lps dot ens.fr> ---
Thanks for the commit. Any plan to take into account the Jakub's remarks in
comment 11?

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[iverbin at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

--- Comment #15 from Ilya Verbin <iverbin at gmail dot com> ---
(In reply to Dominique d'Humieres from comment #14)
> Thanks for the commit. Any plan to take into account the Jakub's remarks in
> comment 11?

Yes, I added them to my TODO list.

[Bug bootstrap/63853] [5.0 Regression] The use of strchrnul breaks bootstrap on x86_64-apple-darwin14.

[tocarip.intel at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63853

tocarip.intel at gmail dot com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |tocarip.intel at gmail dot com

--- Comment #16 from tocarip.intel at gmail dot com ---
I've taken into account Jakub's input. Committed as r218044