@@ -77,30 +77,40 @@ static int NOINLINE compare_svec(jl_svec_t *a, jl_svec_t *b)
7777// See comment above for an explanation of NOINLINE.
7878static int NOINLINE compare_fields (jl_value_t * a , jl_value_t * b , jl_datatype_t * dt )
7979{
80- size_t nf = jl_datatype_nfields (dt );
81- for (size_t f = 0 ; f < nf ; f ++ ) {
80+ size_t f , nf = jl_datatype_nfields (dt );
81+ for (f = 0 ; f < nf ; f ++ ) {
8282 size_t offs = jl_field_offset (dt , f );
8383 char * ao = (char * )jl_data_ptr (a ) + offs ;
8484 char * bo = (char * )jl_data_ptr (b ) + offs ;
85- int eq ;
8685 if (jl_field_isptr (dt , f )) {
8786 jl_value_t * af = * (jl_value_t * * )ao ;
8887 jl_value_t * bf = * (jl_value_t * * )bo ;
89- if (af == bf ) eq = 1 ;
90- else if (af == NULL || bf == NULL ) eq = 0 ;
91- else eq = jl_egal (af , bf );
88+ if (af != bf ) {
89+ if (af == NULL || bf == NULL )
90+ return 0 ;
91+ if (!jl_egal (af , bf ))
92+ return 0 ;
93+ }
9294 }
9395 else {
9496 jl_datatype_t * ft = (jl_datatype_t * )jl_field_type (dt , f );
97+ if (jl_is_uniontype (ft )) {
98+ uint8_t asel = ((uint8_t * )ao )[jl_field_size (dt , f ) - 1 ];
99+ uint8_t bsel = ((uint8_t * )bo )[jl_field_size (dt , f ) - 1 ];
100+ if (asel != bsel )
101+ return 0 ;
102+ ft = (jl_datatype_t * )jl_nth_union_component ((jl_value_t * )ft , asel );
103+ }
95104 if (!ft -> layout -> haspadding ) {
96- eq = bits_equal (ao , bo , jl_field_size (dt , f ));
105+ if (!bits_equal (ao , bo , jl_field_size (dt , f )))
106+ return 0 ;
97107 }
98108 else {
99109 assert (jl_datatype_nfields (ft ) > 0 );
100- eq = compare_fields ((jl_value_t * )ao , (jl_value_t * )bo , ft );
110+ if (!compare_fields ((jl_value_t * )ao , (jl_value_t * )bo , ft ))
111+ return 0 ;
101112 }
102113 }
103- if (!eq ) return 0 ;
104114 }
105115 return 1 ;
106116}
@@ -127,9 +137,11 @@ JL_DLLEXPORT int jl_egal(jl_value_t *a, jl_value_t *b)
127137 return 0 ;
128138 return !memcmp (jl_string_data (a ), jl_string_data (b ), l );
129139 }
130- if (dt -> mutabl ) return 0 ;
140+ if (dt -> mutabl )
141+ return 0 ;
131142 size_t sz = jl_datatype_size (dt );
132- if (sz == 0 ) return 1 ;
143+ if (sz == 0 )
144+ return 1 ;
133145 size_t nf = jl_datatype_nfields (dt );
134146 if (nf == 0 )
135147 return bits_equal (jl_data_ptr (a ), jl_data_ptr (b ), sz );
@@ -161,10 +173,10 @@ static uintptr_t bits_hash(void *b, size_t sz)
161173static uintptr_t NOINLINE hash_svec (jl_svec_t * v )
162174{
163175 uintptr_t h = 0 ;
164- size_t l = jl_svec_len (v );
165- for ( size_t i = 0 ; i < l ; i ++ ) {
166- jl_value_t * x = jl_svecref (v ,i );
167- uintptr_t u = x == NULL ? 0 : jl_object_id (x );
176+ size_t i , l = jl_svec_len (v );
177+ for ( i = 0 ; i < l ; i ++ ) {
178+ jl_value_t * x = jl_svecref (v , i );
179+ uintptr_t u = ( x == NULL ) ? 0 : jl_object_id (x );
168180 h = bitmix (h , u );
169181 }
170182 return h ;
@@ -188,9 +200,11 @@ static uintptr_t jl_object_id_(jl_value_t *tv, jl_value_t *v)
188200 if (dt == jl_typename_type )
189201 return ((jl_typename_t * )v )-> hash ;
190202#ifdef _P64
191- if (v == jl_ANY_flag ) return 0x31c472f68ee30bddULL ;
203+ if (v == jl_ANY_flag )
204+ return 0x31c472f68ee30bddULL ;
192205#else
193- if (v == jl_ANY_flag ) return 0x8ee30bdd ;
206+ if (v == jl_ANY_flag )
207+ return 0x8ee30bdd ;
194208#endif
195209 if (dt == jl_string_type ) {
196210#ifdef _P64
@@ -199,24 +213,29 @@ static uintptr_t jl_object_id_(jl_value_t *tv, jl_value_t *v)
199213 return memhash32_seed (jl_string_data (v ), jl_string_len (v ), 0xedc3b677 );
200214#endif
201215 }
202- if (dt -> mutabl ) return inthash ((uintptr_t )v );
216+ if (dt -> mutabl )
217+ return inthash ((uintptr_t )v );
203218 size_t sz = jl_datatype_size (tv );
204219 uintptr_t h = jl_object_id (tv );
205- if (sz == 0 ) return ~h ;
206- size_t nf = jl_datatype_nfields (dt );
207- if (nf == 0 ) {
220+ if (sz == 0 )
221+ return ~h ;
222+ size_t f , nf = jl_datatype_nfields (dt );
223+ if (nf == 0 )
208224 return bits_hash (jl_data_ptr (v ), sz ) ^ h ;
209- }
210- for (size_t f = 0 ; f < nf ; f ++ ) {
225+ for (f = 0 ; f < nf ; f ++ ) {
211226 size_t offs = jl_field_offset (dt , f );
212227 char * vo = (char * )jl_data_ptr (v ) + offs ;
213228 uintptr_t u ;
214229 if (jl_field_isptr (dt , f )) {
215230 jl_value_t * f = * (jl_value_t * * )vo ;
216- u = f == NULL ? 0 : jl_object_id (f );
231+ u = ( f == NULL ) ? 0 : jl_object_id (f );
217232 }
218233 else {
219234 jl_datatype_t * fieldtype = (jl_datatype_t * )jl_field_type (dt , f );
235+ if (jl_is_uniontype (fieldtype )) {
236+ uint8_t sel = ((uint8_t * )vo )[jl_field_size (dt , f ) - 1 ];
237+ fieldtype = (jl_datatype_t * )jl_nth_union_component ((jl_value_t * )fieldtype , sel );
238+ }
220239 assert (jl_is_datatype (fieldtype ) && !fieldtype -> abstract && !fieldtype -> mutabl );
221240 if (fieldtype -> layout -> haspadding )
222241 u = jl_object_id_ ((jl_value_t * )fieldtype , (jl_value_t * )vo );
@@ -244,7 +263,7 @@ JL_CALLABLE(jl_f_is)
244263 JL_NARGS (== = , 2 , 2 );
245264 if (args [0 ] == args [1 ])
246265 return jl_true ;
247- return jl_egal (args [0 ],args [1 ]) ? jl_true : jl_false ;
266+ return jl_egal (args [0 ], args [1 ]) ? jl_true : jl_false ;
248267}
249268
250269JL_CALLABLE (jl_f_typeof )
0 commit comments