Use GIMME_V in preference to GIMME

GIMME_V is a simpler macro that results in smaller machine code.

GIMME does not distinguish between scalar and void context.  The two
instances of GIMME == G_SCALAR that I changed (which used to match
void context too, but no longer do) are in code paths unreachable in
void context, so we don’t need to check for it.

1 files changed, 3 insertions, 1 deletions

diff --git a/op.h b/op.h
index 4bc44de521..2487ca72a8 100644
--- a/op.h
+++ b/op.h
@@ -150,12 +150,14 @@ Deprecated.  Use C<GIMME_V> instead.
 #define OPf_LIST	OPf_WANT_LIST
 #define OPf_KNOW	OPf_WANT
 
-#define GIMME \
+#ifndef PERL_CORE
+#  define GIMME \
 	  (PL_op->op_flags & OPf_WANT					\
 	   ? ((PL_op->op_flags & OPf_WANT) == OPf_WANT_LIST		\
 	      ? G_ARRAY							\
 	      : G_SCALAR)						\
 	   : dowantarray())
+#endif
 
 
 /* NOTE: OPp* flags are now auto-generated and defined in opcode.h,