When code is loaded through an @INC-hook, and when this hook

has set a filename entry in %INC, make sure __FILE__ is set
for this code accordingly to the contents of that %INC entry.

p4raw-id: //depot/perl@29197

1 files changed, 6 insertions, 0 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index 7b91e86c23..7a8da0d5ce 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3166,6 +3166,7 @@ PP(pp_require)
 
 		if (SvROK(dirsv)) {
 		    int count;
+		    SV **svp;
 		    SV *loader = dirsv;
 
 		    if (SvTYPE(SvRV(loader)) == SVt_PVAV
@@ -3193,6 +3194,11 @@ PP(pp_require)
 			count = call_sv(loader, G_ARRAY);
 		    SPAGAIN;
 
+		    /* Adjust file name if the hook has set an %INC entry */
+		    svp = hv_fetch(GvHVn(PL_incgv), name, len, 0);
+		    if (svp)
+			tryname = SvPVX_const(*svp);
+
 		    if (count > 0) {
 			int i = 0;
 			SV *arg;