@@ -1483,7 +1483,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1483
1483
v. normalize( bx. target_spec( ) . pointer_width) . bit_width( ) . unwrap( )
1484
1484
) ,
1485
1485
ty:: Float ( v) => format ! ( "v{}f{}" , vec_len, v. bit_width( ) ) ,
1486
- ty:: RawPtr ( _) => format ! ( "v{}p0" , vec_len) ,
1486
+ ty:: RawPtr ( _, _ ) => format ! ( "v{}p0" , vec_len) ,
1487
1487
_ => unreachable ! ( ) ,
1488
1488
}
1489
1489
}
@@ -1493,7 +1493,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1493
1493
ty:: Int ( v) => cx. type_int_from_ty ( v) ,
1494
1494
ty:: Uint ( v) => cx. type_uint_from_ty ( v) ,
1495
1495
ty:: Float ( v) => cx. type_float_from_ty ( v) ,
1496
- ty:: RawPtr ( _) => cx. type_ptr ( ) ,
1496
+ ty:: RawPtr ( _, _ ) => cx. type_ptr ( ) ,
1497
1497
_ => unreachable ! ( ) ,
1498
1498
} ;
1499
1499
cx. type_vector ( elem_ty, vec_len)
@@ -1548,8 +1548,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1548
1548
1549
1549
require ! (
1550
1550
matches!(
1551
- element_ty1. kind( ) ,
1552
- ty:: RawPtr ( p ) if p . ty == in_elem && p . ty . kind( ) == element_ty0. kind( )
1551
+ * element_ty1. kind( ) ,
1552
+ ty:: RawPtr ( p_ty , _ ) if p_ty == in_elem && p_ty . kind( ) == element_ty0. kind( )
1553
1553
) ,
1554
1554
InvalidMonomorphization :: ExpectedElementType {
1555
1555
span,
@@ -1654,8 +1654,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1654
1654
1655
1655
require ! (
1656
1656
matches!(
1657
- pointer_ty. kind( ) ,
1658
- ty:: RawPtr ( p ) if p . ty == values_elem && p . ty . kind( ) == values_elem. kind( )
1657
+ * pointer_ty. kind( ) ,
1658
+ ty:: RawPtr ( p_ty , _ ) if p_ty == values_elem && p_ty . kind( ) == values_elem. kind( )
1659
1659
) ,
1660
1660
InvalidMonomorphization :: ExpectedElementType {
1661
1661
span,
@@ -1746,8 +1746,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1746
1746
// The second argument must be a mutable pointer type matching the element type
1747
1747
require ! (
1748
1748
matches!(
1749
- pointer_ty. kind( ) ,
1750
- ty:: RawPtr ( p ) if p . ty == values_elem && p . ty . kind( ) == values_elem. kind( ) && p . mutbl . is_mut( )
1749
+ * pointer_ty. kind( ) ,
1750
+ ty:: RawPtr ( p_ty , p_mutbl ) if p_ty == values_elem && p_ty . kind( ) == values_elem. kind( ) && p_mutbl . is_mut( )
1751
1751
) ,
1752
1752
InvalidMonomorphization :: ExpectedElementType {
1753
1753
span,
@@ -1843,9 +1843,9 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
1843
1843
1844
1844
require ! (
1845
1845
matches!(
1846
- element_ty1. kind( ) ,
1847
- ty:: RawPtr ( p )
1848
- if p . ty == in_elem && p . mutbl . is_mut( ) && p . ty . kind( ) == element_ty0. kind( )
1846
+ * element_ty1. kind( ) ,
1847
+ ty:: RawPtr ( p_ty , p_mutbl )
1848
+ if p_ty == in_elem && p_mutbl . is_mut( ) && p_ty . kind( ) == element_ty0. kind( )
1849
1849
) ,
1850
1850
InvalidMonomorphization :: ExpectedElementType {
1851
1851
span,
@@ -2074,8 +2074,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
2074
2074
) ;
2075
2075
2076
2076
match in_elem. kind ( ) {
2077
- ty:: RawPtr ( p ) => {
2078
- let metadata = p . ty . ptr_metadata_ty ( bx. tcx , |ty| {
2077
+ ty:: RawPtr ( p_ty , _ ) => {
2078
+ let metadata = p_ty . ptr_metadata_ty ( bx. tcx , |ty| {
2079
2079
bx. tcx . normalize_erasing_regions ( ty:: ParamEnv :: reveal_all ( ) , ty)
2080
2080
} ) ;
2081
2081
require ! (
@@ -2088,8 +2088,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
2088
2088
}
2089
2089
}
2090
2090
match out_elem. kind ( ) {
2091
- ty:: RawPtr ( p ) => {
2092
- let metadata = p . ty . ptr_metadata_ty ( bx. tcx , |ty| {
2091
+ ty:: RawPtr ( p_ty , _ ) => {
2092
+ let metadata = p_ty . ptr_metadata_ty ( bx. tcx , |ty| {
2093
2093
bx. tcx . normalize_erasing_regions ( ty:: ParamEnv :: reveal_all ( ) , ty)
2094
2094
} ) ;
2095
2095
require ! (
@@ -2120,7 +2120,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
2120
2120
) ;
2121
2121
2122
2122
match in_elem. kind ( ) {
2123
- ty:: RawPtr ( _) => { }
2123
+ ty:: RawPtr ( _, _ ) => { }
2124
2124
_ => {
2125
2125
return_error ! ( InvalidMonomorphization :: ExpectedPointer { span, name, ty: in_elem } )
2126
2126
}
@@ -2152,7 +2152,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
2152
2152
_ => return_error ! ( InvalidMonomorphization :: ExpectedUsize { span, name, ty: in_elem } ) ,
2153
2153
}
2154
2154
match out_elem. kind ( ) {
2155
- ty:: RawPtr ( _) => { }
2155
+ ty:: RawPtr ( _, _ ) => { }
2156
2156
_ => {
2157
2157
return_error ! ( InvalidMonomorphization :: ExpectedPointer { span, name, ty: out_elem } )
2158
2158
}
0 commit comments