@@ -87,15 +87,15 @@ Perl_sv_unref(pTHX_ SV *sv)
87
87
{
88
88
PERL_ARGS_ASSERT_SV_UNREF ;
89
89
90
- sv_unref_flags (sv , 0 );
90
+ sv_unref (sv );
91
91
}
92
92
93
93
void
94
94
Perl_sv_taint (pTHX_ SV * sv )
95
95
{
96
96
PERL_ARGS_ASSERT_SV_TAINT ;
97
97
98
- sv_magic (( sv ), NULL , PERL_MAGIC_taint , NULL , 0 );
98
+ sv_taint ( sv );
99
99
}
100
100
101
101
/* sv_2iv() is now a macro using Perl_sv_2iv_flags();
@@ -107,7 +107,7 @@ Perl_sv_2iv(pTHX_ SV *sv)
107
107
{
108
108
PERL_ARGS_ASSERT_SV_2IV ;
109
109
110
- return sv_2iv_flags (sv , SV_GMAGIC );
110
+ return sv_2iv (sv );
111
111
}
112
112
113
113
/* sv_2uv() is now a macro using Perl_sv_2uv_flags();
@@ -119,7 +119,7 @@ Perl_sv_2uv(pTHX_ SV *sv)
119
119
{
120
120
PERL_ARGS_ASSERT_SV_2UV ;
121
121
122
- return sv_2uv_flags (sv , SV_GMAGIC );
122
+ return sv_2uv (sv );
123
123
}
124
124
125
125
/* sv_2nv() is now a macro using Perl_sv_2nv_flags();
@@ -129,7 +129,7 @@ Perl_sv_2uv(pTHX_ SV *sv)
129
129
NV
130
130
Perl_sv_2nv (pTHX_ SV * sv )
131
131
{
132
- return sv_2nv_flags (sv , SV_GMAGIC );
132
+ return sv_2nv (sv );
133
133
}
134
134
135
135
@@ -142,38 +142,38 @@ Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp)
142
142
{
143
143
PERL_ARGS_ASSERT_SV_2PV ;
144
144
145
- return sv_2pv_flags (sv , lp , SV_GMAGIC );
145
+ return sv_2pv (sv , lp );
146
146
}
147
147
148
148
char *
149
149
Perl_sv_2pv_nolen (pTHX_ SV * sv )
150
150
{
151
151
PERL_ARGS_ASSERT_SV_2PV_NOLEN ;
152
- return sv_2pv (sv , NULL );
152
+ return sv_2pv_nolen (sv );
153
153
}
154
154
155
155
char *
156
156
Perl_sv_2pvbyte_nolen (pTHX_ SV * sv )
157
157
{
158
158
PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN ;
159
159
160
- return sv_2pvbyte (sv , NULL );
160
+ return sv_2pvbyte_nolen (sv );
161
161
}
162
162
163
163
char *
164
164
Perl_sv_2pvutf8_nolen (pTHX_ SV * sv )
165
165
{
166
166
PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN ;
167
167
168
- return sv_2pvutf8 (sv , NULL );
168
+ return sv_2pvutf8_nolen (sv );
169
169
}
170
170
171
171
void
172
172
Perl_sv_force_normal (pTHX_ SV * sv )
173
173
{
174
174
PERL_ARGS_ASSERT_SV_FORCE_NORMAL ;
175
175
176
- sv_force_normal_flags (sv , 0 );
176
+ sv_force_normal (sv );
177
177
}
178
178
179
179
/* sv_setsv() is now a macro using Perl_sv_setsv_flags();
@@ -197,15 +197,15 @@ Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen)
197
197
{
198
198
PERL_ARGS_ASSERT_SV_CATPVN ;
199
199
200
- sv_catpvn_flags (dsv , sstr , slen , SV_GMAGIC );
200
+ sv_catpvn (dsv , sstr , slen );
201
201
}
202
202
203
203
void
204
204
Perl_sv_catpvn_mg (pTHX_ SV * dsv , const char * sstr , STRLEN len )
205
205
{
206
206
PERL_ARGS_ASSERT_SV_CATPVN_MG ;
207
207
208
- sv_catpvn_flags (dsv ,sstr ,len , SV_GMAGIC | SV_SMAGIC );
208
+ sv_catpvn_mg (dsv ,sstr ,len );
209
209
}
210
210
211
211
/* sv_catsv() is now a macro using Perl_sv_catsv_flags();
@@ -217,15 +217,15 @@ Perl_sv_catsv(pTHX_ SV *dsv, SV * const sstr)
217
217
{
218
218
PERL_ARGS_ASSERT_SV_CATSV ;
219
219
220
- sv_catsv_flags (dsv , sstr , SV_GMAGIC );
220
+ sv_catsv (dsv , sstr );
221
221
}
222
222
223
223
void
224
224
Perl_sv_catsv_mg (pTHX_ SV * dsv , SV * const sstr )
225
225
{
226
226
PERL_ARGS_ASSERT_SV_CATSV_MG ;
227
227
228
- sv_catsv_flags (dsv ,sstr , SV_GMAGIC | SV_SMAGIC );
228
+ sv_catsv_mg (dsv ,sstr );
229
229
}
230
230
231
231
/*
@@ -261,7 +261,7 @@ Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp)
261
261
{
262
262
PERL_ARGS_ASSERT_SV_PVN_FORCE ;
263
263
264
- return sv_pvn_force_flags (sv , lp , SV_GMAGIC );
264
+ return sv_pvn_force (sv , lp );
265
265
}
266
266
267
267
/* sv_pvbyte () is now a macro using Perl_sv_2pv_flags();
@@ -295,7 +295,7 @@ Perl_sv_utf8_upgrade(pTHX_ SV *sv)
295
295
{
296
296
PERL_ARGS_ASSERT_SV_UTF8_UPGRADE ;
297
297
298
- return sv_utf8_upgrade_flags (sv , SV_GMAGIC );
298
+ return sv_utf8_upgrade (sv );
299
299
}
300
300
301
301
#if defined(HUGE_VAL ) || (defined(USE_LONG_DOUBLE ) && defined(HUGE_VALL ))
@@ -320,39 +320,39 @@ Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix)
320
320
{
321
321
PERL_ARGS_ASSERT_GV_FULLNAME3 ;
322
322
323
- gv_fullname4 (sv , gv , prefix , TRUE );
323
+ gv_fullname3 (sv , gv , prefix );
324
324
}
325
325
326
326
void
327
327
Perl_gv_efullname3 (pTHX_ SV * sv , const GV * gv , const char * prefix )
328
328
{
329
329
PERL_ARGS_ASSERT_GV_EFULLNAME3 ;
330
330
331
- gv_efullname4 (sv , gv , prefix , TRUE );
331
+ gv_efullname3 (sv , gv , prefix );
332
332
}
333
333
334
334
GV *
335
335
Perl_gv_fetchmethod (pTHX_ HV * stash , const char * name )
336
336
{
337
337
PERL_ARGS_ASSERT_GV_FETCHMETHOD ;
338
338
339
- return gv_fetchmethod_autoload (stash , name , TRUE );
339
+ return gv_fetchmethod (stash , name );
340
340
}
341
341
342
342
HE *
343
343
Perl_hv_iternext (pTHX_ HV * hv )
344
344
{
345
345
PERL_ARGS_ASSERT_HV_ITERNEXT ;
346
346
347
- return hv_iternext_flags (hv , 0 );
347
+ return hv_iternext (hv );
348
348
}
349
349
350
350
void
351
351
Perl_hv_magic (pTHX_ HV * hv , GV * gv , int how )
352
352
{
353
353
PERL_ARGS_ASSERT_HV_MAGIC ;
354
354
355
- sv_magic ( MUTABLE_SV ( hv ), MUTABLE_SV ( gv ) , how , NULL , 0 );
355
+ hv_magic ( hv , gv , how );
356
356
}
357
357
358
358
bool
@@ -361,8 +361,7 @@ Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw,
361
361
{
362
362
PERL_ARGS_ASSERT_DO_OPEN ;
363
363
364
- return do_openn (gv , name , len , as_raw , rawmode , rawperm ,
365
- supplied_fp , (SV * * ) NULL , 0 );
364
+ return do_open (gv , name , len , as_raw , rawmode , rawperm , supplied_fp );
366
365
}
367
366
368
367
#ifndef OS2
@@ -371,7 +370,7 @@ Perl_do_aexec(pTHX_ SV *really, SV **mark, SV **sp)
371
370
{
372
371
PERL_ARGS_ASSERT_DO_AEXEC ;
373
372
374
- return do_aexec5 (really , mark , sp , 0 , 0 );
373
+ return do_aexec (really , mark , sp );
375
374
}
376
375
#endif
377
376
@@ -425,7 +424,7 @@ Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len)
425
424
{
426
425
PERL_ARGS_ASSERT_SV_USEPVN_MG ;
427
426
428
- sv_usepvn_flags (sv ,ptr ,len , SV_SMAGIC );
427
+ sv_usepvn_mg (sv ,ptr ,len );
429
428
}
430
429
431
430
@@ -434,47 +433,44 @@ Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len)
434
433
{
435
434
PERL_ARGS_ASSERT_SV_USEPVN ;
436
435
437
- sv_usepvn_flags (sv ,ptr ,len , 0 );
436
+ sv_usepvn (sv ,ptr ,len );
438
437
}
439
438
440
439
HE *
441
440
Perl_hv_store_ent (pTHX_ HV * hv , SV * keysv , SV * val , U32 hash )
442
441
{
443
- return ( HE * ) hv_common ( hv , keysv , NULL , 0 , 0 , HV_FETCH_ISSTORE , val , hash );
442
+ return hv_store_ent ( hv , keysv , val , hash );
444
443
}
445
444
446
445
bool
447
446
Perl_hv_exists_ent (pTHX_ HV * hv , SV * keysv , U32 hash )
448
447
{
449
448
PERL_ARGS_ASSERT_HV_EXISTS_ENT ;
450
449
451
- return cBOOL ( hv_common ( hv , keysv , NULL , 0 , 0 , HV_FETCH_ISEXISTS , 0 , hash ) );
450
+ return hv_exists_ent ( hv , keysv , hash );
452
451
}
453
452
454
453
HE *
455
454
Perl_hv_fetch_ent (pTHX_ HV * hv , SV * keysv , I32 lval , U32 hash )
456
455
{
457
456
PERL_ARGS_ASSERT_HV_FETCH_ENT ;
458
457
459
- return (HE * )hv_common (hv , keysv , NULL , 0 , 0 ,
460
- (lval ? HV_FETCH_LVALUE : 0 ), NULL , hash );
458
+ return hv_fetch_ent (hv , keysv , lval , hash );
461
459
}
462
460
463
461
SV *
464
462
Perl_hv_delete_ent (pTHX_ HV * hv , SV * keysv , I32 flags , U32 hash )
465
463
{
466
464
PERL_ARGS_ASSERT_HV_DELETE_ENT ;
467
465
468
- return MUTABLE_SV (hv_common (hv , keysv , NULL , 0 , 0 , flags | HV_DELETE , NULL ,
469
- hash ));
466
+ return hv_delete_ent (hv , keysv , flags , hash );
470
467
}
471
468
472
469
SV * *
473
470
Perl_hv_store_flags (pTHX_ HV * hv , const char * key , I32 klen , SV * val , U32 hash ,
474
471
int flags )
475
472
{
476
- return (SV * * ) hv_common (hv , NULL , key , klen , flags ,
477
- (HV_FETCH_ISSTORE |HV_FETCH_JUST_SV ), val , hash );
473
+ return hv_store_flags (hv , key , klen , val , hash , flags );
478
474
}
479
475
480
476
SV * *
@@ -554,11 +550,7 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags)
554
550
AV *
555
551
Perl_newAV (pTHX )
556
552
{
557
- return MUTABLE_AV (newSV_type (SVt_PVAV ));
558
- /* sv_upgrade does AvREAL_only():
559
- AvALLOC(av) = 0;
560
- AvARRAY(av) = NULL;
561
- AvMAX(av) = AvFILLp(av) = -1; */
553
+ return newAV ();
562
554
}
563
555
564
556
HV *
@@ -575,39 +567,39 @@ Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len,
575
567
const char * const little , const STRLEN littlelen )
576
568
{
577
569
PERL_ARGS_ASSERT_SV_INSERT ;
578
- sv_insert_flags (bigstr , offset , len , little , littlelen , SV_GMAGIC );
570
+ sv_insert (bigstr , offset , len , little , littlelen );
579
571
}
580
572
581
573
IO *
582
574
Perl_newIO (pTHX )
583
575
{
584
- return MUTABLE_IO ( newSV_type ( SVt_PVIO ) );
576
+ return newIO ( );
585
577
}
586
578
587
579
I32
588
580
Perl_my_stat (pTHX )
589
581
{
590
- return my_stat_flags ( SV_GMAGIC );
582
+ return my_stat ( );
591
583
}
592
584
593
585
I32
594
586
Perl_my_lstat (pTHX )
595
587
{
596
- return my_lstat_flags ( SV_GMAGIC );
588
+ return my_lstat ( );
597
589
}
598
590
599
591
I32
600
592
Perl_sv_eq (pTHX_ SV * sv1 , SV * sv2 )
601
593
{
602
- return sv_eq_flags (sv1 , sv2 , SV_GMAGIC );
594
+ return sv_eq (sv1 , sv2 );
603
595
}
604
596
605
597
#ifdef USE_LOCALE_COLLATE
606
598
char *
607
599
Perl_sv_collxfrm (pTHX_ SV * const sv , STRLEN * const nxp )
608
600
{
609
601
PERL_ARGS_ASSERT_SV_COLLXFRM ;
610
- return sv_collxfrm_flags (sv , nxp , SV_GMAGIC );
602
+ return sv_collxfrm (sv , nxp );
611
603
}
612
604
613
605
#endif
@@ -616,13 +608,13 @@ bool
616
608
Perl_sv_2bool (pTHX_ SV * const sv )
617
609
{
618
610
PERL_ARGS_ASSERT_SV_2BOOL ;
619
- return sv_2bool_flags (sv , SV_GMAGIC );
611
+ return sv_2bool (sv );
620
612
}
621
613
622
614
CV *
623
615
Perl_newSUB (pTHX_ I32 floor , OP * o , OP * proto , OP * block )
624
616
{
625
- return newATTRSUB (floor , o , proto , NULL , block );
617
+ return newSUB (floor , o , proto , block );
626
618
}
627
619
628
620
SV *
@@ -636,7 +628,7 @@ Perl_sv_copypv(pTHX_ SV *const dsv, SV *const ssv)
636
628
{
637
629
PERL_ARGS_ASSERT_SV_COPYPV ;
638
630
639
- sv_copypv_flags (dsv , ssv , SV_GMAGIC );
631
+ sv_copypv (dsv , ssv );
640
632
}
641
633
642
634
STRLEN
@@ -645,7 +637,7 @@ Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end)
645
637
646
638
PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF ;
647
639
648
- return isUTF8_CHAR (buf , buf_end );
640
+ return is_utf8_char_buf (buf , buf_end );
649
641
}
650
642
651
643
/*
0 commit comments