Merge commit '15c8d31392b9fbab3b3368b67acc4bbe5983115a' into cranelift-rebase

XAMPPRocky · XAMPPRocky · commit ef53ebc5da96 · 2021-04-30T18:46:59.000+02:00
diff --git a/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs b/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs
@@ -71,7 +71,10 @@ impl UnwindContext {
         }
     }
 
-    #[cfg(feature = "jit")]
+    #[cfg(all(feature = "jit", windows))]
+    pub(crate) unsafe fn register_jit(self, _jit_module: &cranelift_jit::JITModule) {}
+
+    #[cfg(all(feature = "jit", not(windows)))]
     pub(crate) unsafe fn register_jit(self, jit_module: &cranelift_jit::JITModule) {
         let mut eh_frame = EhFrame::from(super::emit::WriterRelocate::new(self.endian));
         self.frame_table.write_eh_frame(&mut eh_frame).unwrap();

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,10 @@ impl UnwindContext {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- #[cfg(feature = "jit")]`
	`74`	`+ #[cfg(all(feature = "jit", windows))]`
	`75`	`+ pub(crate) unsafe fn register_jit(self, _jit_module: &cranelift_jit::JITModule) {}`
	`76`	`+`
	`77`	`+ #[cfg(all(feature = "jit", not(windows)))]`
`75`	`78`	`pub(crate) unsafe fn register_jit(self, jit_module: &cranelift_jit::JITModule) {`
`76`	`79`	`let mut eh_frame = EhFrame::from(super::emit::WriterRelocate::new(self.endian));`
`77`	`80`	`self.frame_table.write_eh_frame(&mut eh_frame).unwrap();`