From: Martin Sebor <msebor@redhat.com>
Date: Fri, 28 Aug 2020 14:31:50 +0000 (-0600)
Subject: Correct calls to vec::safe_grow in conditionally compiled code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ad755dcbbd56c0524ed4028f790a37a139138c5;p=gcc.git

Correct calls to vec::safe_grow in conditionally compiled code.

gcc/ChangeLog:

	* ggc-common.c (gt_pch_save): Add argument to a call.

gcc/jit/ChangeLog:

	* jit-recording.c (recording::switch_::make_debug_string): Add argument
	to a call.
---

diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index 0d528cf455c..94da02f1185 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -506,7 +506,7 @@ gt_pch_save (FILE *f)
       if (__builtin_expect (RUNNING_ON_VALGRIND, 0))
 	{
 	  if (vbits.length () < valid_size)
-	    vbits.safe_grow (valid_size);
+	    vbits.safe_grow (valid_size, true);
 	  get_vbits = VALGRIND_GET_VBITS (state.ptrs[i]->obj,
 					  vbits.address (), valid_size);
 	  if (get_vbits == 3)
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
index b73cd76a0a0..a9e6528db69 100644
--- a/gcc/jit/jit-recording.c
+++ b/gcc/jit/jit-recording.c
@@ -6310,7 +6310,7 @@ recording::switch_::make_debug_string ()
     {
       size_t len = strlen (c->get_debug_string ());
       unsigned idx = cases_str.length ();
-      cases_str.safe_grow (idx + 1 + len);
+      cases_str.safe_grow (idx + 1 + len, true);
       cases_str[idx] = ' ';
       memcpy (&(cases_str[idx + 1]),
 	      c->get_debug_string (),