[win32] integrate mainline

p4raw-id: //depot/win32/perl@973

1 files changed, 3 insertions, 2 deletions

diff --git a/pp_hot.c b/pp_hot.c
index be1ce49059..2fba24a80e 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1997,8 +1997,9 @@ PP(pp_entersub)
      	 * (3) instead of (2) so we'd have to clone. Would the fact
      	 * that we released the mutex more quickly make up for this?
      	 */
-	svp = hv_fetch(thr->cvcache, (char *)cv, sizeof(cv), FALSE);
-     	if (svp) {
+	if (threadnum &&
+	    (svp = hv_fetch(thr->cvcache, (char *)cv, sizeof(cv), FALSE)))
+	{
 	    /* We already have a clone to use */
 	    MUTEX_UNLOCK(CvMUTEXP(cv));
 	    cv = *(CV**)svp;