summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embedvar.h1
-rw-r--r--intrpvar.h2
-rw-r--r--mg.c1
-rw-r--r--op.c4
-rw-r--r--perl.h2
5 files changed, 2 insertions, 8 deletions
diff --git a/embedvar.h b/embedvar.h
index ef2fa686a8..3643bd132e 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -157,7 +157,6 @@
#define PL_hash_rand_bits (vTHX->Ihash_rand_bits)
#define PL_hash_rand_bits_enabled (vTHX->Ihash_rand_bits_enabled)
#define PL_hintgv (vTHX->Ihintgv)
-#define PL_hints (vTHX->Ihints)
#define PL_hv_fetch_ent_mh (vTHX->Ihv_fetch_ent_mh)
#define PL_in_clean_all (vTHX->Iin_clean_all)
#define PL_in_clean_objs (vTHX->Iin_clean_objs)
diff --git a/intrpvar.h b/intrpvar.h
index 299ac0f7eb..61028f29da 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -540,8 +540,6 @@ PERLVAR(I, padix, I32) /* max used index in current "register" pad */
PERLVAR(I, padix_floor, I32) /* how low may inner block reset padix */
-PERLVAR(I, hints, U32) /* pragma-tic compile-time flags */
-
#ifdef USE_LOCALE_COLLATE
PERLVAR(I, collation_name, char *) /* Name of current collation */
PERLVAR(I, collxfrm_base, Size_t) /* Basic overhead in *xfrm() */
diff --git a/mg.c b/mg.c
index b4c06923ee..0ce58ab5d2 100644
--- a/mg.c
+++ b/mg.c
@@ -2590,7 +2590,6 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
break;
case '\010': /* ^H */
PL_hints = SvIV(sv);
- CopHINTS_set(&PL_compiling, PL_hints);
break;
case '\011': /* ^I */ /* NOT \t in EBCDIC */
Safefree(PL_inplace);
diff --git a/op.c b/op.c
index f580783dfa..1064aff291 100644
--- a/op.c
+++ b/op.c
@@ -2882,7 +2882,6 @@ Perl_block_end(pTHX_ I32 floor, OP *seq)
CALL_BLOCK_HOOKS(bhk_pre_end, &retval);
LEAVE_SCOPE(floor);
- CopHINTS_set(&PL_compiling, PL_hints);
if (needblockscope)
PL_hints |= HINT_BLOCK_SCOPE; /* propagate out */
o = pad_leavemy();
@@ -3275,7 +3274,6 @@ S_fold_constants(pTHX_ OP *o)
/* Verify that we don't need to save it: */
assert(PL_curcop == &PL_compiling);
StructCopy(&PL_compiling, &not_compiling, COP);
- CopHINTS_set(&not_compiling, PL_hints);
PL_curcop = &not_compiling;
/* The above ensures that we run with all the correct hints of the
currently compiling COP, but that IN_PERL_RUNTIME is not true. */
@@ -5697,7 +5695,6 @@ Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o)
#ifdef NATIVE_HINTS
cop->op_private |= NATIVE_HINTS;
#endif
- CopHINTS_set(&PL_compiling, CopHINTS_get(cop));
cop->op_next = (OP*)cop;
cop->cop_seq = seq;
@@ -7692,7 +7689,6 @@ S_process_special_blocks(pTHX_ I32 floor, const char *const fullname,
GvCV_set(gv,0); /* cv has been hijacked */
call_list(oldscope, PL_beginav);
- CopHINTS_set(&PL_compiling, PL_hints);
LEAVE;
}
else
diff --git a/perl.h b/perl.h
index d3648e15a2..883042413d 100644
--- a/perl.h
+++ b/perl.h
@@ -4668,6 +4668,8 @@ EXTCONST char *const PL_phase_names[];
# define PL_amagic_generation PL_na
#endif /* !PERL_CORE */
+#define PL_hints PL_compiling.cop_hints
+
END_EXTERN_C
/*****************************************************************************/