Also fix paren-less calls of subs where a filehandle could be

If a sub exists, it takes precedence over the filehandle
interpretation even without the parens:

    $ perl  -le 'sub foo { "bar" } print foo;'
    bar

2 files changed, 4 insertions, 1 deletions

diff --git a/t/lib/feature/bareword_filehandles b/t/lib/feature/bareword_filehandles
index 38f8d6530c..a3604770d4 100644
--- a/t/lib/feature/bareword_filehandles
+++ b/t/lib/feature/bareword_filehandles
@@ -490,6 +490,9 @@ use feature "say";
 no feature "bareword_filehandles";
 sub foo {}
 print foo();
+print foo;
 say foo();
+say foo;
 -x foo();
+-x foo;
 EXPECT
diff --git a/toke.c b/toke.c
index 75dcee5beb..c1d1f76eb0 100644
--- a/toke.c
+++ b/toke.c
@@ -7620,7 +7620,7 @@ yyl_just_a_word(pTHX_ char *s, STRLEN len, I32 orig_keyword, struct code c)
         s = SvPVX(PL_linestr) + s_off;
 
         if (((PL_opargs[PL_last_lop_op] >> OASHIFT) & 7) == OA_FILEREF
-            && !immediate_paren
+            && !immediate_paren && !c.cv
             && !FEATURE_BAREWORD_FILEHANDLES_IS_ENABLED) {
             no_bareword_filehandle(PL_tokenbuf);
         }