@@ -1715,7 +1715,7 @@ static jl_value_t *jl_deserialize_value_singleton(jl_serializer_state *s, jl_val
1715
1715
arraylist_push (& flagref_list , (void * )pos );
1716
1716
}
1717
1717
}
1718
- jl_datatype_t * dt = (jl_datatype_t * )jl_deserialize_value (s , HT_NOTFOUND ); // no loc, since if dt is replaced, then dt->instance would be also
1718
+ jl_datatype_t * dt = (jl_datatype_t * )jl_deserialize_value (s , ( jl_value_t * * ) HT_NOTFOUND ); // no loc, since if dt is replaced, then dt->instance would be also
1719
1719
jl_set_typeof (v , dt );
1720
1720
return v ;
1721
1721
}
@@ -2540,7 +2540,7 @@ static jl_datatype_t *jl_recache_type(jl_datatype_t *dt, size_t start, jl_value_
2540
2540
return t ;
2541
2541
}
2542
2542
2543
- static void jl_update_backref_list (jl_value_t * old , jl_value_t * new , size_t start )
2543
+ static void jl_update_backref_list (jl_value_t * old , jl_value_t * _new , size_t start )
2544
2544
{
2545
2545
// update the backref list
2546
2546
size_t j = start ;
@@ -2550,9 +2550,9 @@ static void jl_update_backref_list(jl_value_t *old, jl_value_t *new, size_t star
2550
2550
jl_value_t * v = loc ? * loc : (jl_value_t * )backref_list .items [offs ];
2551
2551
if ((jl_value_t * )v == old ) { // same item, update this entry
2552
2552
if (loc )
2553
- * loc = (jl_value_t * )new ;
2553
+ * loc = (jl_value_t * )_new ;
2554
2554
if (offs > 0 )
2555
- backref_list .items [offs ] = new ;
2555
+ backref_list .items [offs ] = _new ;
2556
2556
// delete this item from the flagref list, so it won't be re-encountered later
2557
2557
flagref_list .len -= 2 ;
2558
2558
if (j >= flagref_list .len )
@@ -2572,10 +2572,10 @@ jl_method_t *jl_recache_method(jl_method_t *m, size_t start)
2572
2572
jl_datatype_t * ftype = jl_first_argument_datatype ((jl_value_t * )sig );
2573
2573
jl_methtable_t * mt = ftype -> name -> mt ;
2574
2574
jl_set_typeof (m , (void * )(intptr_t )0x30 ); // invalidate the old value to help catch errors
2575
- jl_method_t * new = (jl_method_t * )jl_methtable_lookup (mt , sig );
2576
- assert (new && jl_is_method (new ));
2577
- jl_update_backref_list ((jl_value_t * )m , (jl_value_t * )new , start );
2578
- return new ;
2575
+ jl_method_t * _new = (jl_method_t * )jl_methtable_lookup (mt , sig );
2576
+ assert (_new && jl_is_method (_new ));
2577
+ jl_update_backref_list ((jl_value_t * )m , (jl_value_t * )_new , start );
2578
+ return _new ;
2579
2579
}
2580
2580
2581
2581
jl_method_instance_t * jl_recache_method_instance (jl_method_instance_t * li , size_t start )
@@ -2592,9 +2592,9 @@ jl_method_instance_t *jl_recache_method_instance(jl_method_instance_t *li, size_
2592
2592
jl_svec_t * env = jl_emptysvec ;
2593
2593
jl_value_t * ti = jl_type_intersection_matching ((jl_value_t * )m -> sig , (jl_value_t * )argtypes , & env , m -> tvars );
2594
2594
assert (ti != jl_bottom_type ); (void )ti ;
2595
- jl_method_instance_t * new = jl_specializations_get_linfo (m , argtypes , env );
2596
- jl_update_backref_list ((jl_value_t * )li , (jl_value_t * )new , start );
2597
- return new ;
2595
+ jl_method_instance_t * _new = jl_specializations_get_linfo (m , argtypes , env );
2596
+ jl_update_backref_list ((jl_value_t * )li , (jl_value_t * )_new , start );
2597
+ return _new ;
2598
2598
}
2599
2599
2600
2600
static void jl_recache_types (void )
@@ -2603,14 +2603,14 @@ static void jl_recache_types(void)
2603
2603
while (i < flagref_list .len ) {
2604
2604
jl_value_t * * loc = (jl_value_t * * )flagref_list .items [i ++ ];
2605
2605
int offs = (int )(intptr_t )flagref_list .items [i ++ ];
2606
- jl_value_t * new , * o = loc ? * loc : (jl_value_t * )backref_list .items [offs ];
2606
+ jl_value_t * _new , * o = loc ? * loc : (jl_value_t * )backref_list .items [offs ];
2607
2607
if (jl_is_method (o )) {
2608
2608
// lookup the real Method based on the placeholder sig
2609
- new = (jl_value_t * )jl_recache_method ((jl_method_t * )o , i );
2609
+ _new = (jl_value_t * )jl_recache_method ((jl_method_t * )o , i );
2610
2610
}
2611
2611
else if (jl_is_method_instance (o )) {
2612
2612
// lookup the real MethodInstance based on the placeholder specTypes
2613
- new = (jl_value_t * )jl_recache_method_instance ((jl_method_instance_t * )o , i );
2613
+ _new = (jl_value_t * )jl_recache_method_instance ((jl_method_instance_t * )o , i );
2614
2614
}
2615
2615
else {
2616
2616
jl_value_t * v ;
@@ -2648,9 +2648,9 @@ static void jl_recache_types(void)
2648
2648
continue ;
2649
2649
}
2650
2650
if (loc )
2651
- * loc = new ;
2651
+ * loc = _new ;
2652
2652
if (offs > 0 )
2653
- backref_list .items [offs ] = new ;
2653
+ backref_list .items [offs ] = _new ;
2654
2654
}
2655
2655
}
2656
2656
0 commit comments