{"id":2226764,"url":"http://patchwork.ozlabs.org/api/patches/2226764/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhup4p5wp2.gcc.gcc-TEST.pinskia.84.1.7@forge-stage.sourceware.org/","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2026-04-22T18:49:15","name":"[v1,07/10] fab/gimple-fold/forwprop: Move va_args folding to gimple_fold [PR121762]","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6e7a46c503b1d793401820665d4ce5086c928190","submitter":{"id":93219,"url":"http://patchwork.ozlabs.org/api/people/93219/?format=json","name":"Andrew Pinski via Sourceware Forge","email":"forge-bot+pinskia@forge-stage.sourceware.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhup4p5wp2.gcc.gcc-TEST.pinskia.84.1.7@forge-stage.sourceware.org/mbox/","series":[{"id":501092,"url":"http://patchwork.ozlabs.org/api/series/501092/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=501092","date":"2026-04-22T18:49:11","name":"remove_fab","version":1,"mbox":"http://patchwork.ozlabs.org/series/501092/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226764/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226764/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","gcc-patches@gcc.gnu.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","gcc-patches@gcc.gnu.org"],"Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)","sourceware.org; dmarc=none (p=none dis=none)\n header.from=forge-stage.sourceware.org","sourceware.org;\n spf=pass smtp.mailfrom=forge-stage.sourceware.org","server2.sourceware.org;\n arc=none smtp.remote-ip=38.145.34.39"],"Received":["from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g18Qt1Vcrz1yGs\n\tfor ; Thu, 23 Apr 2026 05:28:38 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id 643C1430E699\n\tfor ; Wed, 22 Apr 2026 19:28:36 +0000 (GMT)","from forge-stage.sourceware.org (vm08.sourceware.org [38.145.34.39])\n by sourceware.org (Postfix) with ESMTPS id 76299407FF70\n for ; Wed, 22 Apr 2026 18:50:43 +0000 (GMT)","from forge-stage.sourceware.org (localhost [IPv6:::1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256)\n (No client certificate requested)\n by forge-stage.sourceware.org (Postfix) with ESMTPS id D2A2E43596\n for ; Wed, 22 Apr 2026 18:50:41 +0000 (UTC)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org 643C1430E699","OpenDKIM Filter v2.11.0 sourceware.org 76299407FF70"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org 76299407FF70","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org 76299407FF70","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883843; cv=none;\n b=bD8CqrAaGoqPRgINvsKBKgmqfcNln2UnZmRx5MWPNUuSqfu+jGXOiettlsQ7Yg+2venzYMdxMAUGaGDMc3eAXene9Ia7Q3DbVgiLUzrmay8D2Pr2SF/JNMsBw4YJU6QFX7rUoOWSBgQ8C/f1yXl7MQbqLUpusK2nm9d9VjFQ1PQ=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776883843; c=relaxed/simple;\n bh=2TIFxCfKd5qeTmC1Hy0mwi3h+1chSF0FwoWlx2d4rZk=;\n h=From:Date:Subject:To:Message-ID;\n b=pQdO/XYGMzPFkDYH/0AjqhNGAMsMbeI6hzAIJZvTKBk2Ff9l784lMaTZ2cpUngg87/sXsmbWjOWIRKh7kM0OKwuj2MnNSR3AIb2QlKAXo5GD8iYpU7s5i1Zev4qupfVoDiPDvMR9Bh8j9in8NRia5aWgo3xkPyrF+IxTg1QZ+zM=","ARC-Authentication-Results":"i=1; server2.sourceware.org","From":"Andrew Pinski via Sourceware Forge\n ","Date":"Wed, 22 Apr 2026 18:49:15 +0000","Subject":"[PATCH v1 07/10] fab/gimple-fold/forwprop: Move va_args folding to\n gimple_fold [PR121762]","To":"gcc-patches mailing list ","Message-ID":"\n ","X-Mailer":"batrachomyomachia","X-Pull-Request-Organization":"gcc","X-Pull-Request-Repository":"gcc-TEST","X-Pull-Request":"https://forge.sourceware.org/gcc/gcc-TEST/pulls/84","References":"\n ","In-Reply-To":"\n ","X-Patch-URL":"\n https://forge.sourceware.org/pinskia/gcc-TEST/commit/e37cc329b2fbb4520cfd1fb1c6f58e5f161dc627","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Reply-To":"gcc-patches mailing list ,\n pinskia@gcc.gnu.org","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"From: Andrew Pinski \n\nThis moves the va_args functions folding to gimple-fold. Right now this is still\nkept for the last folding but later it can move sometime after stdargs pass is run by\nchecking PROP_gimple_lva instead.\nAlso for forwprop, if a folding happens for the last folding we need to maybe update the\nvariables as non-addressable like what is done in fab. It was originally added in fab for\n__builtin_sincos->__builtin_cexpi folding (PR39643). After the removal of fab, this will\nalso be the last pass which updates address taken too.\n\ngcc/ChangeLog:\n\n\t* gimple-fold.cc (gimple_fold_builtin_stdarg): New function,\n\tmoved from tree-ssa-ccp.cc (optimize_stdarg_builtin).\n\t(gimple_fold_builtin): Call gimple_fold_builtin_stdarg for\n\tva_start, va_copy and va_end.\n\t* tree-ssa-ccp.cc (optimize_stdarg_builtin): Remove.\n\t(pass_fold_builtins::execute): Remove handling of\n\tva_start, va_copy and va_end.\n\t* tree-ssa-forwprop.cc (pass_forwprop::execute): Update\n\ttodos if fold_stmt return true if last forwprop to include\n\tTODO_update_address_taken.\n\nSigned-off-by: Andrew Pinski \n---\n gcc/gimple-fold.cc | 125 ++++++++++++++++++++++++++++++++++++++\n gcc/tree-ssa-ccp.cc | 126 ---------------------------------------\n gcc/tree-ssa-forwprop.cc | 5 ++\n 3 files changed, 130 insertions(+), 126 deletions(-)","diff":"diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc\nindex a12fb5e8eab1..2f64de2fb414 100644\n--- a/gcc/gimple-fold.cc\n+++ b/gcc/gimple-fold.cc\n@@ -5252,6 +5252,127 @@ gimple_fold_builtin_assume_aligned (gimple_stmt_iterator *gsi)\n return true;\n }\n \n+/* If va_list type is a simple pointer and nothing special is needed,\n+ optimize __builtin_va_start (&ap, 0) into ap = __builtin_next_arg (0),\n+ __builtin_va_end (&ap) out as NOP and __builtin_va_copy into a simple\n+ pointer assignment. Returns true if a change happened. */\n+\n+static bool\n+gimple_fold_builtin_stdarg (gimple_stmt_iterator *gsi, gcall *call)\n+{\n+ /* These shouldn't be folded before pass_stdarg. */\n+ if (!(cfun->curr_properties & PROP_last_full_fold))\n+ return false;\n+\n+ tree callee, lhs, rhs, cfun_va_list;\n+ bool va_list_simple_ptr;\n+ location_t loc = gimple_location (call);\n+ gimple *nstmt0, *nstmt;\n+ tree tlhs, oldvdef, newvdef;\n+\n+ callee = gimple_call_fndecl (call);\n+\n+ cfun_va_list = targetm.fn_abi_va_list (callee);\n+ va_list_simple_ptr = POINTER_TYPE_P (cfun_va_list)\n+\t\t && (TREE_TYPE (cfun_va_list) == void_type_node\n+\t\t\t || TREE_TYPE (cfun_va_list) == char_type_node);\n+\n+ switch (DECL_FUNCTION_CODE (callee))\n+ {\n+ case BUILT_IN_VA_START:\n+ if (!va_list_simple_ptr\n+\t || targetm.expand_builtin_va_start != NULL\n+\t || !builtin_decl_explicit_p (BUILT_IN_NEXT_ARG))\n+\treturn false;\n+\n+ if (gimple_call_num_args (call) != 2)\n+\treturn false;\n+\n+ lhs = gimple_call_arg (call, 0);\n+ if (!POINTER_TYPE_P (TREE_TYPE (lhs))\n+\t || TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (lhs)))\n+\t != TYPE_MAIN_VARIANT (cfun_va_list))\n+\treturn false;\n+ /* Create `tlhs = __builtin_next_arg(0);`. */\n+ tlhs = make_ssa_name (cfun_va_list);\n+ nstmt0 = gimple_build_call (builtin_decl_explicit (BUILT_IN_NEXT_ARG), 1, integer_zero_node);\n+ lhs = fold_build2 (MEM_REF, cfun_va_list, lhs, build_zero_cst (TREE_TYPE (lhs)));\n+ gimple_call_set_lhs (nstmt0, tlhs);\n+ gimple_set_location (nstmt0, loc);\n+ gimple_move_vops (nstmt0, call);\n+ gsi_replace (gsi, nstmt0, false);\n+ oldvdef = gimple_vdef (nstmt0);\n+ newvdef = make_ssa_name (gimple_vop (cfun), nstmt0);\n+ gimple_set_vdef (nstmt0, newvdef);\n+\n+ /* Create `*lhs = tlhs;`. */\n+ nstmt = gimple_build_assign (lhs, tlhs);\n+ gimple_set_location (nstmt, loc);\n+ gimple_set_vuse (nstmt, newvdef);\n+ gimple_set_vdef (nstmt, oldvdef);\n+ SSA_NAME_DEF_STMT (oldvdef) = nstmt;\n+ gsi_insert_after (gsi, nstmt, GSI_NEW_STMT);\n+\n+ if (dump_file && (dump_flags & TDF_DETAILS))\n+\t{\n+\t fprintf (dump_file, \"Simplified\\n \");\n+\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n+\t fprintf (dump_file, \"into\\n \");\n+\t print_gimple_stmt (dump_file, nstmt0, 0, dump_flags);\n+\t fprintf (dump_file, \" \");\n+\t print_gimple_stmt (dump_file, nstmt, 0, dump_flags);\n+\t}\n+ return true;\n+\n+ case BUILT_IN_VA_COPY:\n+ if (!va_list_simple_ptr)\n+\treturn false;\n+\n+ if (gimple_call_num_args (call) != 2)\n+\treturn false;\n+\n+ lhs = gimple_call_arg (call, 0);\n+ if (!POINTER_TYPE_P (TREE_TYPE (lhs))\n+\t || TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (lhs)))\n+\t != TYPE_MAIN_VARIANT (cfun_va_list))\n+\treturn false;\n+ rhs = gimple_call_arg (call, 1);\n+ if (TYPE_MAIN_VARIANT (TREE_TYPE (rhs))\n+\t != TYPE_MAIN_VARIANT (cfun_va_list))\n+\treturn false;\n+\n+ lhs = fold_build2 (MEM_REF, cfun_va_list, lhs, build_zero_cst (TREE_TYPE (lhs)));\n+ nstmt = gimple_build_assign (lhs, rhs);\n+ gimple_set_location (nstmt, loc);\n+ gimple_move_vops (nstmt, call);\n+ gsi_replace (gsi, nstmt, false);\n+\n+ if (dump_file && (dump_flags & TDF_DETAILS))\n+\t{\n+\t fprintf (dump_file, \"Simplified\\n \");\n+\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n+\t fprintf (dump_file, \"into\\n \");\n+\t print_gimple_stmt (dump_file, nstmt, 0, dump_flags);\n+\t}\n+ return true;\n+\n+ case BUILT_IN_VA_END:\n+ /* No effect, so the statement will be deleted. */\n+ if (dump_file && (dump_flags & TDF_DETAILS))\n+\t{\n+\t fprintf (dump_file, \"Removed\\n \");\n+\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n+\t}\n+ unlink_stmt_vdef (call);\n+ release_defs (call);\n+ gsi_replace (gsi, gimple_build_nop (), true);\n+ return true;\n+\n+ default:\n+ gcc_unreachable ();\n+ }\n+}\n+\n /* Fold the non-target builtin at *GSI and return whether any simplification\n was made. */\n \n@@ -5270,6 +5391,10 @@ gimple_fold_builtin (gimple_stmt_iterator *gsi)\n enum built_in_function fcode = DECL_FUNCTION_CODE (callee);\n switch (fcode)\n {\n+ case BUILT_IN_VA_START:\n+ case BUILT_IN_VA_END:\n+ case BUILT_IN_VA_COPY:\n+ return gimple_fold_builtin_stdarg (gsi, stmt);\n case BUILT_IN_BCMP:\n return gimple_fold_builtin_bcmp (gsi);\n case BUILT_IN_BCOPY:\ndiff --git a/gcc/tree-ssa-ccp.cc b/gcc/tree-ssa-ccp.cc\nindex b69a8b64a61b..2d16395ac68e 100644\n--- a/gcc/tree-ssa-ccp.cc\n+++ b/gcc/tree-ssa-ccp.cc\n@@ -3085,124 +3085,6 @@ make_pass_ccp (gcc::context *ctxt)\n return new pass_ccp (ctxt);\n }\n \n-/* If va_list type is a simple pointer and nothing special is needed,\n- optimize __builtin_va_start (&ap, 0) into ap = __builtin_next_arg (0),\n- __builtin_va_end (&ap) out as NOP and __builtin_va_copy into a simple\n- pointer assignment. Returns true if a change happened. */\n-\n-static bool\n-optimize_stdarg_builtin (gimple_stmt_iterator *gsi, gimple *call)\n-{\n- tree callee, lhs, rhs, cfun_va_list;\n- bool va_list_simple_ptr;\n- location_t loc = gimple_location (call);\n- gimple *nstmt0, *nstmt;\n- tree tlhs, oldvdef, newvdef;\n-\n- callee = gimple_call_fndecl (call);\n-\n- cfun_va_list = targetm.fn_abi_va_list (callee);\n- va_list_simple_ptr = POINTER_TYPE_P (cfun_va_list)\n-\t\t && (TREE_TYPE (cfun_va_list) == void_type_node\n-\t\t\t || TREE_TYPE (cfun_va_list) == char_type_node);\n-\n- switch (DECL_FUNCTION_CODE (callee))\n- {\n- case BUILT_IN_VA_START:\n- if (!va_list_simple_ptr\n-\t || targetm.expand_builtin_va_start != NULL\n-\t || !builtin_decl_explicit_p (BUILT_IN_NEXT_ARG))\n-\treturn false;\n-\n- if (gimple_call_num_args (call) != 2)\n-\treturn false;\n-\n- lhs = gimple_call_arg (call, 0);\n- if (!POINTER_TYPE_P (TREE_TYPE (lhs))\n-\t || TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (lhs)))\n-\t != TYPE_MAIN_VARIANT (cfun_va_list))\n-\treturn false;\n- /* Create `tlhs = __builtin_next_arg(0);`. */\n- tlhs = make_ssa_name (cfun_va_list);\n- nstmt0 = gimple_build_call (builtin_decl_explicit (BUILT_IN_NEXT_ARG), 1, integer_zero_node);\n- lhs = fold_build2 (MEM_REF, cfun_va_list, lhs, build_zero_cst (TREE_TYPE (lhs)));\n- gimple_call_set_lhs (nstmt0, tlhs);\n- gimple_set_location (nstmt0, loc);\n- gimple_move_vops (nstmt0, call);\n- gsi_replace (gsi, nstmt0, false);\n- oldvdef = gimple_vdef (nstmt0);\n- newvdef = make_ssa_name (gimple_vop (cfun), nstmt0);\n- gimple_set_vdef (nstmt0, newvdef);\n-\n- /* Create `*lhs = tlhs;`. */\n- nstmt = gimple_build_assign (lhs, tlhs);\n- gimple_set_location (nstmt, loc);\n- gimple_set_vuse (nstmt, newvdef);\n- gimple_set_vdef (nstmt, oldvdef);\n- SSA_NAME_DEF_STMT (oldvdef) = nstmt;\n- gsi_insert_after (gsi, nstmt, GSI_NEW_STMT);\n-\n- if (dump_file && (dump_flags & TDF_DETAILS))\n-\t{\n-\t fprintf (dump_file, \"Simplified\\n \");\n-\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n-\t fprintf (dump_file, \"into\\n \");\n-\t print_gimple_stmt (dump_file, nstmt0, 0, dump_flags);\n-\t fprintf (dump_file, \" \");\n-\t print_gimple_stmt (dump_file, nstmt, 0, dump_flags);\n-\t}\n- return true;\n-\n- case BUILT_IN_VA_COPY:\n- if (!va_list_simple_ptr)\n-\treturn false;\n-\n- if (gimple_call_num_args (call) != 2)\n-\treturn false;\n-\n- lhs = gimple_call_arg (call, 0);\n- if (!POINTER_TYPE_P (TREE_TYPE (lhs))\n-\t || TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (lhs)))\n-\t != TYPE_MAIN_VARIANT (cfun_va_list))\n-\treturn false;\n- rhs = gimple_call_arg (call, 1);\n- if (TYPE_MAIN_VARIANT (TREE_TYPE (rhs))\n-\t != TYPE_MAIN_VARIANT (cfun_va_list))\n-\treturn false;\n-\n- lhs = fold_build2 (MEM_REF, cfun_va_list, lhs, build_zero_cst (TREE_TYPE (lhs)));\n- nstmt = gimple_build_assign (lhs, rhs);\n- gimple_set_location (nstmt, loc);\n- gimple_move_vops (nstmt, call);\n- gsi_replace (gsi, nstmt, false);\n-\n- if (dump_file && (dump_flags & TDF_DETAILS))\n-\t{\n-\t fprintf (dump_file, \"Simplified\\n \");\n-\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n-\t fprintf (dump_file, \"into\\n \");\n-\t print_gimple_stmt (dump_file, nstmt, 0, dump_flags);\n-\t}\n- return true;\n-\n- case BUILT_IN_VA_END:\n- /* No effect, so the statement will be deleted. */\n- if (dump_file && (dump_flags & TDF_DETAILS))\n-\t{\n-\t fprintf (dump_file, \"Removed\\n \");\n-\t print_gimple_stmt (dump_file, call, 0, dump_flags);\n-\t}\n- unlink_stmt_vdef (call);\n- release_defs (call);\n- gsi_replace (gsi, gimple_build_nop (), true);\n- return true;\n-\n- default:\n- gcc_unreachable ();\n- }\n-}\n-\n-\n /* Convert\n _1 = __atomic_fetch_or_* (ptr_6, 1, _3);\n _7 = ~_1;\n@@ -4339,14 +4221,6 @@ pass_fold_builtins::execute (function *fun)\n \t\t\t\t\t\t false);\n \t\t break;\n \n-\t\tcase BUILT_IN_VA_START:\n-\t\tcase BUILT_IN_VA_END:\n-\t\tcase BUILT_IN_VA_COPY:\n-\t\t /* These shouldn't be folded before pass_stdarg. */\n-\t\t if (optimize_stdarg_builtin (&i, stmt))\n-\t\t todoflags |= TODO_update_address_taken;\n-\t\t break;\n-\n \t\tdefault:;\n \t\t}\n \ndiff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc\nindex c7ac96a28aa0..f72aac219805 100644\n--- a/gcc/tree-ssa-forwprop.cc\n+++ b/gcc/tree-ssa-forwprop.cc\n@@ -5464,6 +5464,11 @@ pass_forwprop::execute (function *fun)\n \t if (fold_stmt (&gsi, fwprop_ssa_val, simple_dce_worklist))\n \t\t{\n \t\t changed = true;\n+\t\t /* There is no updating of the address\n+\t\t taken after the last forwprop so update\n+\t\t the addresses when a folding happened. */\n+\t\t if (last_p)\n+\t\t todoflags |= TODO_update_address_taken;\n \t\t stmt = gsi_stmt (gsi);\n \t\t /* Cleanup the CFG if we simplified a condition to\n \t\t true or false. */\n","prefixes":["v1","07/10"]}