From 12d40d4a8d0495cf2c7b564daa8aaa7f107a6c56 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Thu, 8 Sep 2022 11:16:09 +0200
Subject: [PATCH] Fix perltidy breaking perlcritic

perltidying a "##no critic" line moves the marker to where it becomes
useless.  Put the line back to how it was, and protect it from further
malfeasance.

Per buildfarm member crake.
---
 src/backend/catalog/Catalog.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index 4a9fa3b2cb..1546e1b335 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -315,8 +315,10 @@ sub ParseData
 					# We're treating the input line as a piece of Perl, so we
 					# need to use string eval here. Tell perlcritic we know what
 					# we're doing.
-					eval '$hash_ref = '
-					  . $_;    ## no critic (ProhibitStringyEval)
+					#<<< protect next line from perltidy
+					# so perlcritic annotation works
+					eval '$hash_ref = ' . $_;    ## no critic (ProhibitStringyEval)
+					#>>>
 					if (!ref $hash_ref)
 					{
 						die "$input_file: error parsing line $.:\n$_\n";