Skip to content

Commit 3ac370b

Browse files
committed
Auto merge of rust-lang#107314 - matthiaskrgr:rollup-j40lnlj, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang#106407 (Improve proc macro attribute diagnostics) - rust-lang#106960 (Teach parser to understand fake anonymous enum syntax) - rust-lang#107085 (Custom MIR: Support binary and unary operations) - rust-lang#107086 (Print PID holding bootstrap build lock on Linux) - rust-lang#107175 (Fix escaping inference var ICE in `point_at_expr_source_of_inferred_type`) - rust-lang#107204 (suggest qualifying bare associated constants) - rust-lang#107248 (abi: add AddressSpace field to Primitive::Pointer ) - rust-lang#107272 (Implement ObjectSafe and WF in the new solver) - rust-lang#107285 (Implement `Generator` and `Future` in the new solver) - rust-lang#107286 (ICE in new solver if we see an inference variable) - rust-lang#107313 (Add Style Team Triagebot config) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 801b1a1 + ef5ec77 commit 3ac370b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/common.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ pub(crate) fn scalar_to_clif_type(tcx: TyCtxt<'_>, scalar: Scalar) -> Type {
3535
},
3636
Primitive::F32 => types::F32,
3737
Primitive::F64 => types::F64,
38-
Primitive::Pointer => pointer_ty(tcx),
38+
// FIXME(erikdesjardins): handle non-default addrspace ptr sizes
39+
Primitive::Pointer(_) => pointer_ty(tcx),
3940
}
4041
}
4142

0 commit comments

Comments
 (0)