gv_magicalize: Move a chunk of code

This is in preparation for future commits, which will end up removing
some goto's.

Author: khwilliamson

gv.c

@@ -2131,13 +2131,6 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len,
                 goto try_core;
             }
             goto ret;
-      try_core:
-        if (len > 1 /* shortest is uc */ && HvNAMELEN_get(stash) == 4) {
-          /* Avoid null warning: */
-          const char * const stashname = HvNAME(stash); assert(stashname);
-          if (strBEGINs(stashname, "CORE"))
-            S_maybe_add_coresub(aTHX_ 0, gv, name, len);
-        }
     }
     else if (len > 1) {
             switch (*name) {
@@ -2472,6 +2465,16 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len,
                            SvOK(GvSV(gv)) || SvMAGICAL(GvSV(gv))
                          )
            );
+
+  try_core:
+    if (len > 1 /* shortest is uc */ && HvNAMELEN_get(stash) == 4) {
+      /* Avoid null warning: */
+      const char * const stashname = HvNAME(stash); assert(stashname);
+      if (strBEGINs(stashname, "CORE"))
+        S_maybe_add_coresub(aTHX_ 0, gv, name, len);
+    }
+
+    goto ret;
 }
 
 /* If we do ever start using this later on in the file, we need to make