From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 620ED3858D33; Fri, 3 Mar 2023 10:20:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 620ED3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677838832; bh=S11I1Mb57q9NuaV0ZWZ2OZf+VdUg9vy6jSPsNGT5gJ8=; h=From:To:Subject:Date:From; b=BqCM0bTeMrqI55vyKhp1w34wa5gZTPTShPwche35f3IewZDo+RlALw6rVRh9NUa9G N08AuQzmvOzZGjk2r4ulxQnraI7TK4FhCwJSjBVjK1iuAo8beQ4iY4LXA4XqAGsEGT SndaTc+sFyd2W6ZDfmvgo5Ojjj1O/gIX8kcZtvOo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6441] gimple-fold: Fix up fputs -> fwrite folding [PR108988] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: a5c543910a1679ba3c9b78e3b362a16a150e2bf7 X-Git-Newrev: dbeccab7a1f5dcc1876c854f17816047ba1ef137 Message-Id: <20230303102032.620ED3858D33@sourceware.org> Date: Fri, 3 Mar 2023 10:20:32 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dbeccab7a1f5dcc1876c854f17816047ba1ef137 commit r13-6441-gdbeccab7a1f5dcc1876c854f17816047ba1ef137 Author: Jakub Jelinek Date: Fri Mar 3 11:13:40 2023 +0100 gimple-fold: Fix up fputs -> fwrite folding [PR108988] gimple_fold_builtin_fputs when folding fputs into fwrite emits the third argument (INTEGER_CST) with incorrect type - get_maxval_strlen or c_strlen return ssizetype, while fwrite argument is size_type_node. The following patch fixes that, I've skimmed through the rest of gimple-fold.cc and in all other places get_maxval_strlen/c_strlen result was fold_converted to size_type_node already (or GIMPLE cast stmt has been emitted directly etc.). 2023-03-03 Jakub Jelinek PR tree-optimization/108988 * gimple-fold.cc (gimple_fold_builtin_fputs): Fold len to size_type_node before passing it as argument to fwrite. Formatting fixes. Diff: --- gcc/gimple-fold.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index f2b3e4bebc3..2b6855d1205 100644 --- a/gcc/gimple-fold.cc +++ b/gcc/gimple-fold.cc @@ -2954,8 +2954,7 @@ gimple_fold_builtin_fputs (gimple_stmt_iterator *gsi, /* Get the length of the string passed to fputs. If the length can't be determined, punt. */ tree len = get_maxval_strlen (arg0, SRK_STRLEN); - if (!len - || TREE_CODE (len) != INTEGER_CST) + if (!len || TREE_CODE (len) != INTEGER_CST) return false; switch (compare_tree_int (len, 1)) @@ -2972,9 +2971,10 @@ gimple_fold_builtin_fputs (gimple_stmt_iterator *gsi, if (!fn_fputc) return false; - gimple *repl = gimple_build_call (fn_fputc, 2, - build_int_cst - (integer_type_node, p[0]), arg1); + gimple *repl + = gimple_build_call (fn_fputc, 2, + build_int_cst (integer_type_node, p[0]), + arg1); replace_call_with_call_and_fold (gsi, repl); return true; } @@ -2990,8 +2990,9 @@ gimple_fold_builtin_fputs (gimple_stmt_iterator *gsi, if (!fn_fwrite) return false; - gimple *repl = gimple_build_call (fn_fwrite, 4, arg0, - size_one_node, len, arg1); + gimple *repl + = gimple_build_call (fn_fwrite, 4, arg0, size_one_node, + fold_convert (size_type_node, len), arg1); replace_call_with_call_and_fold (gsi, repl); return true; }