Mostly revert change #23347 (keep the test suite, fixed),

having decided that it wasn't a correct fix for bug #31793.
p4raw-link: @23347 on //depot/perl: d411a6a9eb5df09116806ed1c441d30d37e8d5e8

p4raw-id: //depot/perl@23469

diff --git a/lib/overload.pm b/lib/overload.pm
index 8c0b899495b52bf696f0599e1c9747bce4543abf..237856f7ffb7c69df9a0f1f4a94a533477a51fc7 100644 (file)
--- a/lib/overload.pm
+++ b/lib/overload.pm
@@ -94,7 +94,7 @@ sub AddrRef {
 }
 
 sub StrVal {
-  (ref $_[0] && Overloaded($_[0]) or ref($_[0]) eq 'Regexp') ?
+  (ref $_[0] && OverloadedStringify($_[0]) or ref($_[0]) eq 'Regexp') ?
     (AddrRef(shift)) :
     "$_[0]";
 }

diff --git a/lib/overload.t b/lib/overload.t
index 7d076c2bfebe39dab1288743f03de4c45dfce0f2..173a1770881dab5891c44028c3b4e04c7742e862 100644 (file)
--- a/lib/overload.t
+++ b/lib/overload.t
@@ -1139,7 +1139,7 @@ test ($@ =~ /zap/);
 
 {
     package perl31793;
-    use overload cmp => sub { 0 };
+    use overload cmp => sub { 0 }, fallback => 1;
     package main;
     my $o  = bless [], 'perl31793';
     my $no = bless [], 'no_overload';