From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id BDA093858D33 for ; Fri, 3 Mar 2023 09:59:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BDA093858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 9297D21E36; Fri, 3 Mar 2023 09:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677837541; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oorL6kzu2ywg/iT2KzjqwNBzN0g41AoUJBq2ORNDCmA=; b=HFm5IWb3aCOV5rnW+xth9undTR4DG3Rg0+wkx9mqyeWFqT8SUMGU5dpyUfw5bscSVYwD4j lLIpKMJUapujt/bWLH/4SnOKrOKwB/4nRUH0QEMpBCGRkqYErmkatiO2uM/ynWFZPcPFyQ IYcQylrlZnvk12f+nMXsigc1f+gLKv8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677837541; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oorL6kzu2ywg/iT2KzjqwNBzN0g41AoUJBq2ORNDCmA=; b=jdVHHfh8YaMiaoYLUFDHAovOgKDRZxAzPL4FOljdXNEB2SQpxP/Z0lHBcnq4Z3YQrashBx JLC3jLaBDKMLhhBA== Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 872122C141; Fri, 3 Mar 2023 09:59:01 +0000 (UTC) Date: Fri, 3 Mar 2023 09:59:01 +0000 (UTC) From: Richard Biener To: Jakub Jelinek cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] gimple-fold: Fix up fputs -> fwrite folding [PR108988] In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 Fri, 3 Mar 2023, Jakub Jelinek wrote: > Hi! > > 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.). > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. > 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. > > --- gcc/gimple-fold.cc.jj 2023-02-28 11:38:28.957868160 +0100 > +++ gcc/gimple-fold.cc 2023-03-02 10:34:42.791504589 +0100 > @@ -2954,8 +2954,7 @@ gimple_fold_builtin_fputs (gimple_stmt_i > /* 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_i > 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_i > 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; > } > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman; HRB 36809 (AG Nuernberg)