From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 31D8439524A6 for ; Fri, 25 Nov 2022 08:40:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 31D8439524A6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x632.google.com with SMTP id ud5so8781486ejc.4 for ; Fri, 25 Nov 2022 00:40:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=JL5oLE6umQLHUccefxzuNQGKC74zv7HtpUX9O2Echy8=; b=IrYFMiuJ9xBAvLa/RzDvCFpkJAkMJv/USSjYhHSXF8KEZRG1DqnQFGAKaLUq2B8VF1 6qkmsL3x7h9MVT4ylkpRG02LR0hXZQJMkXWWbhYnzwEpQb64IddEsGzy/bBOW+S56XNU 1Tb4uRim3oxT2FtqeXVLn6RvpQJtNA821QkBouHj/rW/vYYDE8IV/HFkgYK3SWKLv2Qh vw8mmib+mcK+4lL2H0rLpw9ABdqZMQcJOW/RGXj393amgL7UlVO/BRtBc/nMNJNiwbtj mCuSMepSXJkaxa7xKHY57tEceKyar1YoBnYz1Qs8WASSvUO1p8xnUlozjePeGczRewp0 UYmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JL5oLE6umQLHUccefxzuNQGKC74zv7HtpUX9O2Echy8=; b=fQ13WtvK2sFtn9Tqn81i0dMh5MytZMFmEAIUQDk1zugHxm2gWJiZX7OaUQx5zYuQpT vOpXQ4ex7jNVSUOSS4HkdezDIqMsuUhhIxG+pzUrs7gi/AT3iWmq7UPiafVxTaZ43761 +h1wJmCMMvnE65pK+DfkPifstd3CUVMWoX+f/2vFep4eV1TsL17tx2UfyGuKSBVZmu9n 36hxqapJAWLp95ZuK67KfHUCyICOXViMfpMS//x/DxNbDrK2gUn6RzOaN6nN1O0uEvY5 nGLfdsAjW2TlvjgHem3PqPxB/U2ml8YnwsWMUsO/Exmo+SdnxTaImTJ/phG9PoeSfFPi DlPA== X-Gm-Message-State: ANoB5plEDumqYersoRJYpBBlFFrn37EAElpj4Ll+mD+BchB+urhDz2lr 6fgP2R+kuktRSQL14WIsNWXl/0w9c08yLqbu905QKCsf X-Google-Smtp-Source: AA0mqf4Boe5MBnDdvXZe5dWN9Jcrk+v35yKI3cLbHf7YvKiBEjh/k15W1bfkcNXrjfMo32vvMfSW0zTXnJl6uHMz6Sg= X-Received: by 2002:a17:907:c787:b0:7ad:8035:ae3d with SMTP id tz7-20020a170907c78700b007ad8035ae3dmr22438714ejc.46.1669365649876; Fri, 25 Nov 2022 00:40:49 -0800 (PST) MIME-Version: 1.0 From: Zopolis0 Date: Fri, 25 Nov 2022 19:40:39 +1100 Message-ID: Subject: [PATCH 15/56] libcpp: Change deps_write and make_write to take class mkdeps instead of const cpp_reader and to learn about the the dependency phoniness via a bool argument. To: gcc-patches@gcc.gnu.org Content-Type: multipart/mixed; boundary="0000000000008fc97805ee477a11" X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,PYZOR_CHECK,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000008fc97805ee477a11 Content-Type: text/plain; charset="UTF-8" --0000000000008fc97805ee477a11 Content-Type: application/x-patch; name="0015-libcpp-Change-deps_write-and-make_write-to-take-clas.patch" Content-Disposition: attachment; filename="0015-libcpp-Change-deps_write-and-make_write-to-take-clas.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_law76gsk0 RnJvbSA0YWQ4YzBkYWFiODY2ZjNkODExMDA2ODQ2YTgwNDBjOWYwNWMwMzg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWlsaWFuIERvd25leSBUd2lzcyA8Y3JlYXRvcnNtaXRo bWR0QGdtYWlsLmNvbT4KRGF0ZTogRnJpLCAxOCBOb3YgMjAyMiAwOToxOTozNCArMTEwMApTdWJq ZWN0OiBbUEFUQ0ggMTUvNTZdIGxpYmNwcDogQ2hhbmdlIGRlcHNfd3JpdGUgYW5kIG1ha2Vfd3Jp dGUgdG8gdGFrZSBjbGFzcwogbWtkZXBzIGluc3RlYWQgb2YgY29uc3QgY3BwX3JlYWRlciBhbmQg dG8gbGVhcm4gYWJvdXQgdGhlIHRoZSBkZXBlbmRlbmN5CiBwaG9uaW5lc3MgdmlhIGEgYm9vbCBh cmd1bWVudC4KCmxpYmNwcC9DaGFuZ2VMb2c6CgoJKiBpbmNsdWRlL21rZGVwcy5oIChkZXBzX3dy aXRlKTogQWRqdXN0IGZpcnN0IHBhcm0gdHlwZSwgcmUtYWRkIHBob255IGFyZ3VtZW50LgoJKiBp bml0LmNjIChjcHBfZmluaXNoKTogQWRqdXN0IGFjY29yZGluZ2x5LgoJKiBta2RlcHMuY2MgKG1h a2Vfd3JpdGUpOiBBZGp1c3QgZmlyc3QgcGFybSB0eXBlLCByZS1hZGQgcGhvbnkgYXJndW1lbnQu CgkoZGVwc193cml0ZSk6IExpa2V3aXNlLgotLS0KIGxpYmNwcC9pbmNsdWRlL21rZGVwcy5oIHwg IDIgKy0KIGxpYmNwcC9pbml0LmNjICAgICAgICAgIHwgIDIgKy0KIGxpYmNwcC9ta2RlcHMuY2Mg ICAgICAgIHwgMTUgKysrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9u cygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliY3BwL2luY2x1ZGUvbWtkZXBz LmggYi9saWJjcHAvaW5jbHVkZS9ta2RlcHMuaAppbmRleCA5NmQ2NDY0MWIxYS4uMWViOTZkM2U4 YWYgMTAwNjQ0Ci0tLSBhL2xpYmNwcC9pbmNsdWRlL21rZGVwcy5oCisrKyBiL2xpYmNwcC9pbmNs dWRlL21rZGVwcy5oCkBAIC02Niw3ICs2Niw3IEBAIGV4dGVybiB2b2lkIGRlcHNfYWRkX2RlcCAo Y2xhc3MgbWtkZXBzICosIGNvbnN0IGNoYXIgKik7CiAKIC8qIFdyaXRlIG91dCBhIGRlcHMgYnVm ZmVyIHRvIGEgc3BlY2lmaWVkIGZpbGUuICBUaGUgbGFzdCBhcmd1bWVudAogICAgaXMgdGhlIG51 bWJlciBvZiBjb2x1bW5zIHRvIHdvcmQtd3JhcCBhdCAoMCBtZWFucyBkb24ndCB3cmFwKS4gICov Ci1leHRlcm4gdm9pZCBkZXBzX3dyaXRlIChjb25zdCBjcHBfcmVhZGVyICosIEZJTEUgKiwgdW5z aWduZWQgaW50KTsKK2V4dGVybiB2b2lkIGRlcHNfd3JpdGUgKGNsYXNzIG1rZGVwcyAqLCBGSUxF ICosIGJvb2wsIHVuc2lnbmVkIGludCk7CiAKIC8qIFdyaXRlIG91dCBhIGRlcHMgYnVmZmVyIHRv IGEgZmlsZSwgaW4gYSBmb3JtIHRoYXQgY2FuIGJlIHJlYWQgYmFjawogICAgd2l0aCBkZXBzX3Jl c3RvcmUuICBSZXR1cm5zIG5vbnplcm8gb24gZXJyb3IsIGluIHdoaWNoIGNhc2UgdGhlCmRpZmYg LS1naXQgYS9saWJjcHAvaW5pdC5jYyBiL2xpYmNwcC9pbml0LmNjCmluZGV4IDVmMzRlMzUxNWQy Li5mYjM3OWRjYzBjZCAxMDA2NDQKLS0tIGEvbGliY3BwL2luaXQuY2MKKysrIGIvbGliY3BwL2lu aXQuY2MKQEAgLTg3MCw3ICs4NzAsNyBAQCBjcHBfZmluaXNoIChjcHBfcmVhZGVyICpwZmlsZSwg RklMRSAqZGVwc19zdHJlYW0pCiAgICAgX2NwcF9wb3BfYnVmZmVyIChwZmlsZSk7CiAKICAgaWYg KGRlcHNfc3RyZWFtKQotICAgIGRlcHNfd3JpdGUgKHBmaWxlLCBkZXBzX3N0cmVhbSwgNzIpOwor ICAgIGRlcHNfd3JpdGUgKHBmaWxlLT5kZXBzLCBkZXBzX3N0cmVhbSwgQ1BQX09QVElPTiAocGZp bGUsIGRlcHMucGhvbnlfdGFyZ2V0cyksIDcyKTsKIAogICAvKiBSZXBvcnQgb24gaGVhZGVycyB0 aGF0IGNvdWxkIHVzZSBtdWx0aXBsZSBpbmNsdWRlIGd1YXJkcy4gICovCiAgIGlmIChDUFBfT1BU SU9OIChwZmlsZSwgcHJpbnRfaW5jbHVkZV9uYW1lcykpCmRpZmYgLS1naXQgYS9saWJjcHAvbWtk ZXBzLmNjIGIvbGliY3BwL21rZGVwcy5jYwppbmRleCAzMGU4N2Q4YjRkNy4uMTkyMTAxNzYyMmYg MTAwNjQ0Ci0tLSBhL2xpYmNwcC9ta2RlcHMuY2MKKysrIGIvbGliY3BwL21rZGVwcy5jYwpAQCAt Mzg3LDEwICszODcsOCBAQCBtYWtlX3dyaXRlX3ZlYyAoY29uc3QgbWtkZXBzOjp2ZWM8Y29uc3Qg Y2hhciAqPiAmdmVjLCBGSUxFICpmcCwKICAgIC5QSE9OWSB0YXJnZXRzIGZvciBhbGwgdGhlIGRl cGVuZGVuY2llcyB0b28uICAqLwogCiBzdGF0aWMgdm9pZAotbWFrZV93cml0ZSAoY29uc3QgY3Bw X3JlYWRlciAqcGZpbGUsIEZJTEUgKmZwLCB1bnNpZ25lZCBpbnQgY29sbWF4KQorbWFrZV93cml0 ZSAoY2xhc3MgbWtkZXBzICpkLCBGSUxFICpmcCwgYm9vbCBwaG9ueSwgdW5zaWduZWQgaW50IGNv bG1heCkKIHsKLSAgY29uc3QgbWtkZXBzICpkID0gcGZpbGUtPmRlcHM7Ci0KICAgdW5zaWduZWQg Y29sdW1uID0gMDsKICAgaWYgKGNvbG1heCAmJiBjb2xtYXggPCAzNCkKICAgICBjb2xtYXggPSAz NDsKQEAgLTM5OCwyMCArMzk2LDE3IEBAIG1ha2Vfd3JpdGUgKGNvbnN0IGNwcF9yZWFkZXIgKnBm aWxlLCBGSUxFICpmcCwgdW5zaWduZWQgaW50IGNvbG1heCkKICAgaWYgKGQtPmRlcHMuc2l6ZSAo KSkKICAgICB7CiAgICAgICBjb2x1bW4gPSBtYWtlX3dyaXRlX3ZlYyAoZC0+dGFyZ2V0cywgZnAs IDAsIGNvbG1heCwgZC0+cXVvdGVfbHdtKTsKLSAgICAgIGlmIChDUFBfT1BUSU9OIChwZmlsZSwg ZGVwcy5tb2R1bGVzKSAmJiBkLT5jbWlfbmFtZSkKKyAgICAgIGlmICgoZC0+bW9kdWxlX25hbWUp ICYmIChkLT5jbWlfbmFtZSkpCiAJY29sdW1uID0gbWFrZV93cml0ZV9uYW1lIChkLT5jbWlfbmFt ZSwgZnAsIGNvbHVtbiwgY29sbWF4KTsKICAgICAgIGZwdXRzICgiOiIsIGZwKTsKICAgICAgIGNv bHVtbisrOwogICAgICAgbWFrZV93cml0ZV92ZWMgKGQtPmRlcHMsIGZwLCBjb2x1bW4sIGNvbG1h eCk7CiAgICAgICBmcHV0cyAoIlxuIiwgZnApOwotICAgICAgaWYgKENQUF9PUFRJT04gKHBmaWxl LCBkZXBzLnBob255X3RhcmdldHMpKQorICAgICAgaWYgKHBob255KQogCWZvciAodW5zaWduZWQg aSA9IDE7IGkgPCBkLT5kZXBzLnNpemUgKCk7IGkrKykKIAkgIGZwcmludGYgKGZwLCAiJXM6XG4i LCBtdW5nZSAoZC0+ZGVwc1tpXSkpOwogICAgIH0KIAotICBpZiAoIUNQUF9PUFRJT04gKHBmaWxl LCBkZXBzLm1vZHVsZXMpKQotICAgIHJldHVybjsKLQogICBpZiAoZC0+bW9kdWxlcy5zaXplICgp KQogICAgIHsKICAgICAgIGNvbHVtbiA9IG1ha2Vfd3JpdGVfdmVjIChkLT50YXJnZXRzLCBmcCwg MCwgY29sbWF4LCBkLT5xdW90ZV9sd20pOwpAQCAtNDY4LDkgKzQ2Myw5IEBAIG1ha2Vfd3JpdGUg KGNvbnN0IGNwcF9yZWFkZXIgKnBmaWxlLCBGSUxFICpmcCwgdW5zaWduZWQgaW50IGNvbG1heCkK IC8qIFJlYWxseSB3ZSBzaG91bGQgYmUgb3BlbmluZyBmcCBoZXJlLiAgKi8KIAogdm9pZAotZGVw c193cml0ZSAoY29uc3QgY3BwX3JlYWRlciAqcGZpbGUsIEZJTEUgKmZwLCB1bnNpZ25lZCBpbnQg Y29sbWF4KQorZGVwc193cml0ZSAoY2xhc3MgbWtkZXBzICpkLCBGSUxFICpmcCwgYm9vbCBwaG9u eSwgdW5zaWduZWQgaW50IGNvbG1heCkKIHsKLSAgbWFrZV93cml0ZSAocGZpbGUsIGZwLCBjb2xt YXgpOworICBtYWtlX3dyaXRlIChkLCBmcCwgcGhvbnksIGNvbG1heCk7CiB9CiAKIC8qIFdyaXRl IG91dCBhIGRlcHMgYnVmZmVyIHRvIGEgZmlsZSwgaW4gYSBmb3JtIHRoYXQgY2FuIGJlIHJlYWQg YmFjawotLSAKMi4zOC4xCgo= --0000000000008fc97805ee477a11--