Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

p4raw-id: //depot/thrperl@4

1 files changed, 9 insertions, 2 deletions

diff --git a/gv.c b/gv.c
index dc6d2e5a91..7f73664e50 100644
--- a/gv.c
+++ b/gv.c
@@ -261,6 +261,7 @@ char* name;
 	             sv_catpvn(tmpstr, "::ISA", 5);
 		     gv  = gv_fetchpv(SvPV(tmpstr,na),TRUE,SVt_PVGV);
                      if (gv) {
+			dTHR;
 			GvAV(gv) = (AV*)SvREFCNT_inc(av);
 			/* ... and re-try lookup */
 			gv = gv_fetchmeth(stash, name, nend - name, 0);
@@ -331,6 +332,7 @@ char *nambeg;
 I32 add;
 I32 sv_type;
 {
+    dTHR;
     register char *name = nambeg;
     register GV *gv = 0;
     GV**gvp;
@@ -695,6 +697,7 @@ GV *gv;
 IO *
 newIO()
 {
+    dTHR;
     IO *io;
     GV *iogv;
 
@@ -711,6 +714,7 @@ void
 gv_check(stash)
 HV* stash;
 {
+    dTHR;
     register HE *entry;
     register I32 i;
     register GV *gv;
@@ -824,6 +828,7 @@ bool
 Gv_AMupdate(stash)
 HV* stash;
 {
+  dTHR;  
   GV** gvp;
   HV* hv;
   GV* gv;
@@ -935,6 +940,7 @@ SV* right;
 int method;
 int flags; 
 {
+  dTHR;
   MAGIC *mg; 
   CV *cv; 
   CV **cvp=NULL, **ocvp=NULL;
@@ -1120,6 +1126,7 @@ int flags;
 	|| inc_dec_ass) RvDEEPCP(left);
   }
   {
+    dTHR;
     dSP;
     BINOP myop;
     SV* res;
@@ -1133,7 +1140,7 @@ int flags;
     SAVESPTR(op);
     op = (OP *) &myop;
     PUTBACK;
-    pp_pushmark();
+    pp_pushmark(ARGS);
 
     EXTEND(sp, notfound + 5);
     PUSHs(lr>0? right: left);
@@ -1145,7 +1152,7 @@ int flags;
     PUSHs((SV*)cv);
     PUTBACK;
 
-    if (op = pp_entersub())
+    if (op = pp_entersub(ARGS))
       runops();
     LEAVE;
     SPAGAIN;