Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hxzuN-0003qZ-OT for pgsql-hackers@arkaria.postgresql.org; Wed, 14 Aug 2019 20:30:12 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hxztO-0002tm-9l for pgsql-hackers@arkaria.postgresql.org; Wed, 14 Aug 2019 20:29:10 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hxztM-0002tf-SY for pgsql-hackers@lists.postgresql.org; Wed, 14 Aug 2019 20:29:10 +0000 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1hxztE-0003wM-QF for pgsql-hackers@postgresql.org; Wed, 14 Aug 2019 20:29:07 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id AC7DC5B4 for ; Wed, 14 Aug 2019 16:28:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 14 Aug 2019 16:28:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=ZA6WDC69OPArXJZ0MunbRbZais8WU elEH90liOtBc6Q=; b=aigwgY8HER8wGtqqpivBLVhG9tOl4c4XE+cs5yYL8QS8U IZ7Sto69p0pd9uHAIYmksAqO+uj/CtWHhI5s8IqzpcNJIEEKamGNta5j+FXWuJn2 ejwrjoaamqJVbyFZ0j9zpnEHTtbPRpbsK1G0Aph0+WsqNI1JGLHkqn9ApjsKUT3A YbhbrHAhTgyo7Gq8mwjxvHtPMUzxlusSp27grOTDFK2cfWDhldfDUjaQz9fDIC72 gL8M80KqLmOE54cHo2w/89Jrmf+39Ce6U23Txyy3+ccJaK9EZ6R7kKP2rW/O5ggt n74Mnj4VZHv+HtntpcEAw/8fkWjdUPcT8V7jT7ZYA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvledgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefvhffuohfkffgfgggtsehmtderre dtfeejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgv ihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtghomheqnecuffhomhgrihhnpe dvnhguqhhurggurhgrnhhtrdgtohhmnecukfhppeelfedrvdegvddrgedtrddvtddvnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvghrrdgvihhsvghnthhrrghuthesvdhnug hquhgrughrrghnthdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from april.pezone.net (p5df228ca.dip0.t-ipconnect.de [93.242.40.202]) by mail.messagingengine.com (Postfix) with ESMTPA id CF3A78005C for ; Wed, 14 Aug 2019 16:28:56 -0400 (EDT) To: pgsql-hackers From: Peter Eisentraut Subject: Improve Assert output Openpgp: preference=signencrypt Autocrypt: addr=peter.eisentraut@2ndquadrant.com; prefer-encrypt=mutual; keydata= xsFNBFUUt6kBEADZd9NNTBJbHmAXXJgPGOdd6Q73l80oifIVgn2tRxP9dYkCfTlo/yLqbKTl JNqTcyM6XrJDnB2sMEUGYCewYZXl+9C4bBJWyNqcEI1ae9u71vEq/fknFLArJ+2wN+f7QuRx Q8d94ZJAiJQ5g3fNk2HVeedCQCKP5dCzU+ZLt2dbsx1PDZLjTO9gf+JswWuGFb5wY5PZVM5V hq66Xk7ZJzHuARacza2RT7J2fkMmQBY+kr7L98Perb0GhafnlhXB0PvUB+N3xpmggMfwuhTu BngS/G/r3GvemxJuFxouw8xsMqrsfdksJXA2gLXYtwRCssdPV3PO0rlD9twqDo8URfIJ5fb6 1g/MV8aTOKjg3Q8MpJPtkwJqN4o3PvbwYdedeFnOVkkYAJdu/aX1v1BeCBDu7Hy3sF52scD3 pQbyQSl9vUDpTLarASAxNbAV0NRJE8dp4vfW6AH1ccryGiFqw/czPK/iN0+MT8wsjAW6WW4w hvjm5UPA1KTwi3ZT8eT5uycuH7QpuNk7LnGGXQ6KaRALFywzkr0A0V0AvFNa+l4wstMaXaB6 dmMXyF0/hfryqyOeu1gAdq4q0/PNC2dPgb/6uoh4eMjN6A5GXcprilhz5DulmsilY21hfSoU S64ODed96pKhprsOxjZiDRsN1QM5MwB+uwVWUNfsX7fIxE0BrwARAQABzSdQZXRlciBFaXNl bnRyYXV0IDxwZXRlckBlaXNlbnRyYXV0Lm9yZz7CwXoEEwEIACQCGwMFCwkIBwMFFQoJCAsF FgIDAQACHgECF4AFAlUUuKQCGQEACgkQoZ8SQ+xBJp8llw//RbGoXnF72FZTlOFsnNyxnWbF vViPCfdAlZl1GGK9OYCvV1dp/956HuhB0wpaGQHiBmQfOPJf/jLOPjXFYm2iEChEycrBChuE j4TSYemMp5BSPILYk9Uwd16kVD/+U6fQfK6H5pOhfBvbM6asMnmpY2wQuvktxHvaGlytFw84 EzFWNZtAZfxkw28w3AhIQkKe9hJanfyDL750RcbyEr8AAHty5IErrvS7tM5vQwIeh5BF26ND CyKPRdZgOgMpcwFfROKBDpAt052CgWIpNdhBdfIKlkCs4/ILxmC3rT/Mb/qZiHcoMMwEu6k+ T7vRAFZZAk62Yrr/U8/vUGKlzRZQoo86fyojCfI0ibCIc0z8rwCVY9P40G9wD9BTCZS/z8Vh jjpBlNnIKw2hM6hbxavKndCJjFFJD08rXrTyrLF/of18xD37vNdYooP9VATB5QjOWFRrscSZ 4a89e+to3m7YVnd4xdXwGp47dYusoax84C8tg1gZrH38ol9dPmnKX6GZrXeS7tH9k8VeUpJ8 HQbRThQRWAT936QpYbLConBmOtmbLmjQOGtiXPo1oK57X/7U/WBja5vWmm2q+Yxtt+3uHGVg DdDU4CJpXo4lX0v2n3QV5EBSW9hjdF3bNfl6GFBb1pPEhqNcMDUc7zkx/2uENdAdk/BnqMgH umip7b0pVfvOwU0EVRS3qQEQAJf6p0P7D+hMYUgCPkvgrcz6OJYsAYdUMUmokfqmkKwK0oJM ew8TNGM53ocKAgQGma5f10rwbZNPlpVPNRX5hwUmwVlcwSut0oE+JfUBH7mpysWvpF05RKIy q9RCoJZrAbXS7Tig56A1QD8IcM00rERZMcCOlI1+q9m4u9AOI+0LyGGSH+VvoyDHD/Jew4R2 TmPEF8Pu7lYiNYK88Q6u0kBkc+Tz3BNlyc6fi3HxnFfp0b75HLXPSTu2SwA/0Q31wHZXwrEU BR9KgSn/qbgy8ydPc97i82fhiFE3cbGexfPrQSMYmDGi+dcQ0s+AMQwC3XyMC0JkHpYUuFkR QdlIvaIhgFUUN2Vr4xF2ADaNTNFc4DYaiPHFAgHZw+3pZWqS4uIiWgJynrEaHw4F3QWU8/JB iyEWDhNq4WBrRA0u914TCCAoFOOKMnRdl8eJrRQKM/5/lXbHFjjlI/LDKhLRFsuQsnJJ3331 RjCzpHPZG5/p5KR1RHiAXa0p/DW5lXyq21hS3kjDlleoHqOxCN/cy0Jgz7qLDq1vZoCl67Sy RAH60c2Xu4may9SVltmot0OzWVHdrfS+85FQGp9580DaeLio7YMFKy2bfEvwQJ/c9xD2QPB+ oSb3V8ueSznXBG5+dyfOsZFRPxceA0wA2rSWZSjxLdKxvyGTj9vsCjaDu13rABEBAAHCwV8E GAEIAAkFAlUUt6kCGwwACgkQoZ8SQ+xBJp+HJhAAxmSTsC5y7p9Zu+nnLpucv/h88oEx985e qWeXzQiwM3pfRZS+PdTH9TyzHK0KOgKoAiubk0vt+BrT91D9d0G5kVQaTctAErGBoMkTaZJT XVEcNphiPzysdSqvprjojMp1y7rG8AP+Xd6m0rE1LRnkRRm8HyI8vdXsuLQPITGWXDLMjaNq AOV3BUnzkgtjMuIYw7SCr+12ZOb5dEKvaG4kjC4kaJ/TLbuBhVANcXkC90yp0AOZLs/cB1Dj OAXno/RUUruJ3r27a+pFv768UAi9QWcdw58yPxreMNMLqAgsS9oTHwHfGNWcB2dJ4UW+GMLJ hTf9TjQ2f+N/sIx5XMQ9pYw6CAJMK29qPx6/ZayrPxf22EXf0D3zTwIEZgwfSkynFVwV25L7 awQq60fifdMYheSxq7GbhpsixmcD+e161cCmLIt75YDt5bQ0B1yf7EmxG8n7pGZAOM6LoNsU fkSldba5XVwh8LuN5mK0nQBELGW6Os4TDq4REggLpfcvFC215zpuo0iCGnmE/Bns4nowqUSP u4tkWL+nxW4qgv8wo8HJ52jd79EJ8iqfIBoidBfy9AIUiEUApGQzWPu6yWcI8fY0rN5D+tc+ Yw1Zt6Mm+huYJpgCRsTcfzEcahnBn521CWcWvhW1ff3KFileFMtNmnBBhMncmRKHphtTKEpN 3jI= Organization: 2ndQuadrant Message-ID: <6c68efe3-117a-dcc1-73d4-18ba1ec532e2@2ndquadrant.com> Date: Wed, 14 Aug 2019 22:28:55 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------762E96DA37D54C07103C0EA5" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------762E96DA37D54C07103C0EA5 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit This kind of output is usually not helpful: TRAP: BadArgument("((context) != ((void *)0) && (((((const Node*)((context)))->type) == T_AllocSetContext) || ((((const Node*)((context)))->type) == T_SlabContext) || ((((const Node*)((context)))->type) == T_GenerationContext)))", File: "../../../../src/include/utils/memutils.h", Line: 129) What we probably want is something like: TRAP: BadArgument("MemoryContextIsValid(context)", File: "../../../../src/include/utils/memutils.h", Line: 129) The problem is that the way the Assert macros are written they macro-expand the arguments before stringifying them. The attached patch fixes that. This requires both replacing CppAsString by plain "#" and not redirecting Assert() to Trap(). -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------762E96DA37D54C07103C0EA5 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-Improve-Assert-output.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Improve-Assert-output.patch" RnJvbSA3ZGI2MGU2MTJlMWQyNmM3YTE4NTk5NDg1OTRjMjhkYzNiNTQzNTNlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNCBBdWcgMjAxOSAyMjoyMzozNCArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIEltcHJvdmUgQXNzZXJ0IG91dHB1dAoKSWYgYW4gYXNzZXJ0aW9uIGV4cHJl c3Npb24gY29udGFpbmVkIGEgbWFjcm8sIHRoZSBmYWlsZWQgYXNzZXJ0aW9uCm1lc3NhZ2Ug d291bGQgcHJpbnQgdGhlIGV4cGFuZGVkIG1hY3JvLCB3aGljaCBpcyB1c3VhbGx5IHVuaGVs cGZ1bCBhbmQKY29uZnVzaW5nLiAgUmVzdHJ1Y3R1cmUgdGhlIEFzc2VydCBtYWNyb3MgdG8g bm90IGV4cGFuZCBhbnkgbWFjcm9zCndoZW4gY29uc3RydWN0aW5nIHRoZSBmYWlsdXJlIG1l c3NhZ2UuCi0tLQogc3JjL2luY2x1ZGUvYy5oIHwgMjYgKysrKysrKysrKysrKysrKysrKyst LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2MuaCBiL3NyYy9pbmNsdWRlL2MuaAppbmRl eCAyYTA4MmFmYWIxLi5mNDYxNjI4YTI0IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9jLmgK KysrIGIvc3JjL2luY2x1ZGUvYy5oCkBAIC03NTUsNyArNzU1LDcgQEAgdHlwZWRlZiBOYW1l RGF0YSAqTmFtZTsKICNkZWZpbmUgVHJhcChjb25kaXRpb24sIGVycm9yVHlwZSkgXAogCWRv IHsgXAogCQlpZiAoY29uZGl0aW9uKSBcCi0JCQlFeGNlcHRpb25hbENvbmRpdGlvbihDcHBB c1N0cmluZyhjb25kaXRpb24pLCAoZXJyb3JUeXBlKSwgXAorCQkJRXhjZXB0aW9uYWxDb25k aXRpb24oI2NvbmRpdGlvbiwgKGVycm9yVHlwZSksIFwKIAkJCQkJCQkJIF9fRklMRV9fLCBf X0xJTkVfXyk7IFwKIAl9IHdoaWxlICgwKQogCkBAIC03NjgsMjAgKzc2OCwzNCBAQCB0eXBl ZGVmIE5hbWVEYXRhICpOYW1lOwogICovCiAjZGVmaW5lIFRyYXBNYWNybyhjb25kaXRpb24s IGVycm9yVHlwZSkgXAogCSgoYm9vbCkgKCEgKGNvbmRpdGlvbikgfHwgXAotCQkJIChFeGNl cHRpb25hbENvbmRpdGlvbihDcHBBc1N0cmluZyhjb25kaXRpb24pLCAoZXJyb3JUeXBlKSwg XAorCQkJIChFeGNlcHRpb25hbENvbmRpdGlvbigjY29uZGl0aW9uLCAoZXJyb3JUeXBlKSwg XAogCQkJCQkJCQkgICBfX0ZJTEVfXywgX19MSU5FX18pLCAwKSkpCiAKICNkZWZpbmUgQXNz ZXJ0KGNvbmRpdGlvbikgXAotCQlUcmFwKCEoY29uZGl0aW9uKSwgIkZhaWxlZEFzc2VydGlv biIpCisJZG8geyBcCisJCWlmICghKGNvbmRpdGlvbikpIFwKKwkJCUV4Y2VwdGlvbmFsQ29u ZGl0aW9uKCNjb25kaXRpb24sICJGYWlsZWRBc3NlcnRpb24iLCBcCisJCQkJCQkJCSBfX0ZJ TEVfXywgX19MSU5FX18pOyBcCisJfSB3aGlsZSAoMCkKIAogI2RlZmluZSBBc3NlcnRNYWNy byhjb25kaXRpb24pIFwKLQkJKCh2b2lkKSBUcmFwTWFjcm8oIShjb25kaXRpb24pLCAiRmFp bGVkQXNzZXJ0aW9uIikpCisJKCh2b2lkKSAoKGNvbmRpdGlvbikgfHwgXAorCQkJIChFeGNl cHRpb25hbENvbmRpdGlvbigjY29uZGl0aW9uLCAiRmFpbGVkQXNzZXJ0aW9uIiwgXAorCQkJ CQkJCQkgICBfX0ZJTEVfXywgX19MSU5FX18pLCAwKSkpCiAKICNkZWZpbmUgQXNzZXJ0QXJn KGNvbmRpdGlvbikgXAotCQlUcmFwKCEoY29uZGl0aW9uKSwgIkJhZEFyZ3VtZW50IikKKwlk byB7IFwKKwkJaWYgKCEoY29uZGl0aW9uKSkgXAorCQkJRXhjZXB0aW9uYWxDb25kaXRpb24o I2NvbmRpdGlvbiwgIkJhZEFyZ3VtZW50IiwgXAorCQkJCQkJCQkgX19GSUxFX18sIF9fTElO RV9fKTsgXAorCX0gd2hpbGUgKDApCiAKICNkZWZpbmUgQXNzZXJ0U3RhdGUoY29uZGl0aW9u KSBcCi0JCVRyYXAoIShjb25kaXRpb24pLCAiQmFkU3RhdGUiKQorCWRvIHsgXAorCQlpZiAo IShjb25kaXRpb24pKSBcCisJCQlFeGNlcHRpb25hbENvbmRpdGlvbigjY29uZGl0aW9uLCAi QmFkU3RhdGUiLCBcCisJCQkJCQkJCSBfX0ZJTEVfXywgX19MSU5FX18pOyBcCisJfSB3aGls ZSAoMCkKIAogLyoKICAqIENoZWNrIHRoYXQgYHB0cicgaXMgYGJuZHInIGFsaWduZWQuCi0t IAoyLjIyLjAKCg== --------------762E96DA37D54C07103C0EA5--