fixes for bugs in C<use warnings qw(FATAL all)> (from Paul Marquess)

p4raw-id: //depot/perl@5995

4 files changed, 107 insertions, 79 deletions

diff --git a/mg.c b/mg.c
index 27039faf1c..0892511727 100644
--- a/mg.c
+++ b/mg.c
@@ -1735,7 +1735,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
 	            PL_compiling.cop_warnings = pWARN_NONE;
 		    break;
 		}
-                if (isWARN_on(sv, WARN_ALL)) {
+                if (isWARN_on(sv, WARN_ALL) && !isWARNf_on(sv, WARN_ALL)) {
 	            PL_compiling.cop_warnings = pWARN_ALL;
 	            PL_dowarn |= G_WARN_ONCE ;
 	        }	
diff --git a/t/pragma/warn/7fatal b/t/pragma/warn/7fatal
index 943bb06fb3..2d29ddbd82 100644
--- a/t/pragma/warn/7fatal
+++ b/t/pragma/warn/7fatal
@@ -14,6 +14,18 @@ EXPECT
 Use of EQ is deprecated at - line 8.
 ########
 
+# Check compile time warning
+use warnings FATAL => 'all' ;
+{
+    no warnings ;
+    1 if $a EQ $b ;
+}
+1 if $a EQ $b ; 
+print STDERR "The End.\n" ;
+EXPECT
+Use of EQ is deprecated at - line 8.
+########
+
 # Check runtime scope of pragma
 use warnings FATAL => 'uninitialized' ;
 {
@@ -27,6 +39,18 @@ Use of uninitialized value in scalar chop at - line 8.
 ########
 
 # Check runtime scope of pragma
+use warnings FATAL => 'all' ;
+{
+    no warnings ;
+    my $b ; chop $b ;
+}
+my $b ; chop $b ;
+print STDERR "The End.\n" ;
+EXPECT
+Use of uninitialized value in scalar chop at - line 8.
+########
+
+# Check runtime scope of pragma
 no warnings ;
 {
     use warnings FATAL => 'uninitialized' ;
@@ -38,6 +62,18 @@ EXPECT
 Use of uninitialized value in scalar chop at - line 6.
 ########
 
+# Check runtime scope of pragma
+no warnings ;
+{
+    use warnings FATAL => 'all' ;
+    $a = sub { my $b ; chop $b ; }
+}
+&$a ;
+print STDERR "The End.\n" ;
+EXPECT
+Use of uninitialized value in scalar chop at - line 6.
+########
+
 --FILE-- abc
 1 if $a EQ $b ;
 1;
diff --git a/warnings.h b/warnings.h
index a2bcaeb43e..f6814e78c4 100644
--- a/warnings.h
+++ b/warnings.h
@@ -22,45 +22,6 @@
 
 #define specialWARN(x)		((x) == pWARN_STD || (x) == pWARN_ALL ||	\
 				 (x) == pWARN_NONE)
-
-#define ckDEAD(x)							\
-	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
-	    IsSet(SvPVX(PL_curcop->cop_warnings), 2*x+1))
-
-#define ckWARN(x)							\
-	( (PL_curcop->cop_warnings != pWARN_STD &&			\
-	   PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
-	       IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )		\
-	  || (PL_curcop->cop_warnings == pWARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN2(x,y)							\
-	  ( (PL_curcop->cop_warnings != pWARN_STD  &&			\
-	     PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) 		\
-	    ||	(PL_curcop->cop_warnings == pWARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN_d(x)							\
-	  (PL_curcop->cop_warnings == pWARN_STD ||			\
-	   PL_curcop->cop_warnings == pWARN_ALL ||			\
-	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )
-
-#define ckWARN2_d(x,y)							\
-	  (PL_curcop->cop_warnings == pWARN_STD ||			\
-	   PL_curcop->cop_warnings == pWARN_ALL ||			\
-	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
-	        (IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	         IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) )
-
-
-#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
-#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
-#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
-#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
-
 #define WARN_ALL		0
 #define WARN_CHMOD		1
 #define WARN_CLOSURE		2
@@ -113,5 +74,40 @@
 #define WARN_ALLstring		"\125\125\125\125\125\125\125\125\125\125\125\125"
 #define WARN_NONEstring		"\0\0\0\0\0\0\0\0\0\0\0\0"
 
+#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
+#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
+#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
+#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
+#define isWARNf_on(c,x)	(IsSet(SvPVX(c), 2*(x)+1))
+
+#define ckDEAD(x)							\
+	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
+	    ( isWARNf_on(PL_curcop->cop_warnings, WARN_ALL) || 		\
+	      isWARNf_on(PL_curcop->cop_warnings, x)))
+
+#define ckWARN(x)							\
+	( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	       isWARN_on(PL_curcop->cop_warnings, x) ) )		\
+	  || (isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN2(x,y)							\
+	  ( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	        isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, y) ) ) 		\
+	    ||	(isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN_d(x)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	      isWARN_on(PL_curcop->cop_warnings, x) ) )
+
+#define ckWARN2_d(x,y)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	        (isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, y) ) ) )
+
 /* end of file warnings.h */
 
diff --git a/warnings.pl b/warnings.pl
index 61602d5608..791beed353 100644
--- a/warnings.pl
+++ b/warnings.pl
@@ -199,45 +199,6 @@ print WARN <<'EOM' ;
 
 #define specialWARN(x)		((x) == pWARN_STD || (x) == pWARN_ALL ||	\
 				 (x) == pWARN_NONE)
-
-#define ckDEAD(x)							\
-	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
-	    IsSet(SvPVX(PL_curcop->cop_warnings), 2*x+1))
-
-#define ckWARN(x)							\
-	( (PL_curcop->cop_warnings != pWARN_STD &&			\
-	   PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
-	       IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )		\
-	  || (PL_curcop->cop_warnings == pWARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN2(x,y)							\
-	  ( (PL_curcop->cop_warnings != pWARN_STD  &&			\
-	     PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) 		\
-	    ||	(PL_curcop->cop_warnings == pWARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN_d(x)							\
-	  (PL_curcop->cop_warnings == pWARN_STD ||			\
-	   PL_curcop->cop_warnings == pWARN_ALL ||			\
-	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
-	      IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )
-
-#define ckWARN2_d(x,y)							\
-	  (PL_curcop->cop_warnings == pWARN_STD ||			\
-	   PL_curcop->cop_warnings == pWARN_ALL ||			\
-	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
-	        (IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	         IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) )
-
-
-#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
-#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
-#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
-#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
-
 EOM
 
 my $offset = 0 ;
@@ -263,6 +224,41 @@ print WARN tab(5, '#define WARN_NONEstring'), '"', ('\0' x $warn_size) , "\"\n"
 
 print WARN <<'EOM';
 
+#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
+#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
+#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
+#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
+#define isWARNf_on(c,x)	(IsSet(SvPVX(c), 2*(x)+1))
+
+#define ckDEAD(x)							\
+	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
+	    ( isWARNf_on(PL_curcop->cop_warnings, WARN_ALL) || 		\
+	      isWARNf_on(PL_curcop->cop_warnings, x)))
+
+#define ckWARN(x)							\
+	( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	       isWARN_on(PL_curcop->cop_warnings, x) ) )		\
+	  || (isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN2(x,y)							\
+	  ( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	        isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, y) ) ) 		\
+	    ||	(isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN_d(x)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	      isWARN_on(PL_curcop->cop_warnings, x) ) )
+
+#define ckWARN2_d(x,y)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	        (isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, y) ) ) )
+
 /* end of file warnings.h */
 
 EOM