Skip to content

Commit 0f57e1c

Browse files
committed
Sync from rust caeb333
2 parents 44b3310 + 5f6c32a commit 0f57e1c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/driver/aot.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ fn emit_module(
7575
name,
7676
kind,
7777
object: Some(tmp_file),
78+
dwarf_object: None,
7879
bytecode: None,
7980
},
8081
work_product,
@@ -111,6 +112,7 @@ fn reuse_workproduct_for_cgu(
111112
name: cgu.name().to_string(),
112113
kind: ModuleKind::Regular,
113114
object,
115+
dwarf_object: None,
114116
bytecode: None,
115117
}
116118
}
@@ -308,6 +310,7 @@ pub(super) fn run_aot(
308310
name: metadata_cgu_name,
309311
kind: ModuleKind::Metadata,
310312
object: Some(tmp_file),
313+
dwarf_object: None,
311314
bytecode: None,
312315
})
313316
} else {

src/intrinsics/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ macro atomic_minmax($fx:expr, $cc:expr, <$T:ident> ($ptr:ident, $src:ident) -> $
146146

147147
macro validate_atomic_type($fx:ident, $intrinsic:ident, $span:ident, $ty:expr) {
148148
match $ty.kind() {
149-
ty::Uint(_) | ty::Int(_) => {}
149+
ty::Uint(_) | ty::Int(_) | ty::RawPtr(..) => {}
150150
_ => {
151151
$fx.tcx.sess.span_err(
152152
$span,
153153
&format!(
154-
"`{}` intrinsic: expected basic integer type, found `{:?}`",
154+
"`{}` intrinsic: expected basic integer or raw pointer type, found `{:?}`",
155155
$intrinsic, $ty
156156
),
157157
);

0 commit comments

Comments
 (0)