rmv/de-dup static const char array "strings"

MSVC due to a bug doesn't merge identicals between .o'es or discard these
vars and their contents.

MEM_WRAP_CHECK_2 has never been used outside of core according to cpan grep
MEM_WRAP_CHECK_2 was removed on the "have PERL_MALLOC_WRAP" branch in
commit fabdb6c0879 "pre-likely cleanup" without explination, probably bc
it was unused. But MEM_WRAP_CHECK_2 was still left on the "no
PERL_MALLOC_WRAP" branch, so remove it from the "no" side for tidyness
since it was a mistake to leave it there if it was removed from the "yes"
side of the #ifdef.

Add MEM_WRAP_CHECK_s API, letter "s" means argument is string or static.
This lets us get rid of the "%s" argument passed to Perl_croak_nocontext at
a couple call sites since we fully control the next and only argument and
its guaranteed to be a string literal. This allows merging of 2
"Out of memory during array extend" c strings by linker now.

Also change the 2 op.h messages into macros which become string literals
at their call sites instead of "read char * from a global char **" which
was going on before.

VC 2003 32b perl527.dll section size before
  .text name
   DE503 virtual size
  .rdata name
   4B621 virtual size

after
  .text name
   DE503 virtual size
  .rdata name
   4B5D1 virtual size

1 files changed, 2 insertions, 10 deletions

diff --git a/av.c b/av.c
index f6ffea627b..918844c376 100644
--- a/av.c
+++ b/av.c
@@ -140,17 +140,13 @@ Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp,
                             ? SSize_t_MAX : key + newmax;
 	      resize:
 		{
-#ifdef PERL_MALLOC_WRAP /* Duplicated in pp_hot.c */
-		    static const char oom_array_extend[] =
-			"Out of memory during array extend";
-#endif
                     /* it should really be newmax+1 here, but if newmax
                      * happens to equal SSize_t_MAX, then newmax+1 is
                      * undefined. This means technically we croak one
                      * index lower than we should in theory; in practice
                      * its unlikely the system has SSize_t_MAX/sizeof(SV*)
                      * bytes to spare! */
-		    MEM_WRAP_CHECK_1(newmax, SV*, oom_array_extend);
+		    MEM_WRAP_CHECK_s(newmax, SV*, "Out of memory during array extend");
 		}
 #ifdef STRESS_REALLOC
 		{
@@ -176,12 +172,8 @@ Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp,
 	    else {
 		newmax = key < 3 ? 3 : key;
 		{
-#ifdef PERL_MALLOC_WRAP /* Duplicated in pp_hot.c */
-		    static const char oom_array_extend[] =
-			"Out of memory during array extend";
-#endif
                     /* see comment above about newmax+1*/
-		    MEM_WRAP_CHECK_1(newmax, SV*, oom_array_extend);
+		    MEM_WRAP_CHECK_s(newmax, SV*, "Out of memory during array extend");
 		}
 		Newx(*allocp, newmax+1, SV*);
 		ary = *allocp + 1;