--- lib/core/src/perl/CPlusPlus.xxs.orig 2017-01-10 20:35:05.445876614 -0700
+++ lib/core/src/perl/CPlusPlus.xxs 2017-01-10 20:39:15.586274234 -0700
@@ -158,8 +158,8 @@ void defuse_lval_magic(pTHX_ SV* sv)
{
MGS *mgs;
I32 mgs_ix;
- assert(PL_savestack[PL_savestack_ix-1].any_i32==SAVEt_DESTRUCTOR_X);
- mgs_ix=PL_savestack[PL_savestack_ix-2].any_i32;
+ assert(PL_savestack[PL_savestack_ix-1].any_uv==SAVEt_DESTRUCTOR_X);
+ mgs_ix=(I32)PL_savestack[PL_savestack_ix-2].any_uv;
mgs=SSPTR(mgs_ix, MGS*);
assert(mgs->mgs_sv==sv);
mgs->mgs_flags=0;
@@ -417,7 +417,7 @@ SV* new_container_magic_sv(pTHX_ const c
AV* av=newAV();
int last_it= t->acc[2].begin ? 2 : 1; // has reverse_iterator?
av_extend(av, last_it);
- *(int*)(AvARRAY(av))=-1; // loop context index
+ AvARRAY(av)[0]=reinterpret_cast<SV *>((IV)-1); // loop context index
AvFILLp(av)=-1; // cached real container size
AvREAL_off(av); // we'll destroy the iterator SVs manually
@@ -521,7 +521,7 @@ int canned_container_access(pTHX_ SV *sv
} else {
it_index=1; it_incr=1;
}
- if (*(int*)(AvARRAY(my_av)) != cix) {
+ if (AvARRAY(my_av)[0] != reinterpret_cast<SV *>((IV)cix)) {
// new loop detected: need a new iterator
if (!acct->begin)
@@ -537,7 +537,7 @@ int canned_container_access(pTHX_ SV *sv
mg->mg_ptr=(char*)obj;
ForLoopArray(cx)=my_av;
}
- *(int*)(AvARRAY(my_av))=cix;
+ AvARRAY(my_av)[0]=reinterpret_cast<SV *>((IV)cix);
AvARRAY(my_av)[it_index]=it_sv=newSV(0);
sv_upgrade(it_sv, SVt_PVIV);
sv_grow(it_sv, acct->obj_size);
--- lib/core/src/perl/namespaces.xs.orig 2016-07-22 06:23:31.000000000 -0600
+++ lib/core/src/perl/namespaces.xs 2017-01-10 20:36:01.716516149 -0700
@@ -219,7 +219,7 @@ void insert_undo(pTHX_ int skip_frames)
memcpy(to_restore->saved, saves, 3 * sizeof(to_restore->saved[0]));
(saves++)->any_dxptr=&reset_ptrs;
(saves++)->any_ptr=to_restore;
- (saves++)->any_i32=SAVEt_DESTRUCTOR_X;
+ (saves++)->any_uv=SAVEt_DESTRUCTOR_X;
} else {
/* we are in the main script scope, no further enclosing contexts */
SV* restore_holder=newSV(0);
@@ -229,7 +229,7 @@ void insert_undo(pTHX_ int skip_frames)
saves=PL_savestack;
memcpy(to_restore->saved, saves, 2 * sizeof(to_restore->saved[0]));
saves[0].any_ptr=restore_holder;
- saves[1].any_i32=SAVEt_FREESV;
+ saves[1].any_uv=SAVEt_FREESV;
}
}
--- lib/core/src/perl/Scope.xs.orig 2016-07-22 06:23:31.000000000 -0600
+++ lib/core/src/perl/Scope.xs 2017-01-10 20:39:47.610069094 -0700
@@ -420,7 +420,7 @@ LEAVE;
for (f=frame_top-3; f >= frame_bottom; --f)
if (mainstack[f].any_ptr == (void*)&localize_marker
&& f+2 < frame_top
- && mainstack[f+2].any_i32 == SAVEt_DESTRUCTOR_X) {
+ && mainstack[f+2].any_uv == SAVEt_DESTRUCTOR_X) {
if (scope != (AV*)mainstack[f+1].any_ptr) break;