Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b12b836

Browse files
committedDec 10, 2022
Auto merge of #105525 - matthiaskrgr:rollup-ricyw5s, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #98391 (Reimplement std's thread parker on top of events on SGX) - #104019 (Compute generator sizes with `-Zprint_type_sizes`) - #104512 (Set `download-ci-llvm = "if-available"` by default when `channel = dev`) - #104901 (Implement masking in FileType comparison on Unix) - #105082 (Fix Async Generator ABI) - #105109 (Add LLVM KCFI support to the Rust compiler) - #105505 (Don't warn about unused parens when they are used by yeet expr) - #105514 (Introduce `Span::is_visible`) - #105516 (Update cargo) - #105522 (Remove wrong note for short circuiting operators) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents cbc70ff + f6c2add commit b12b836

File tree

58 files changed

+913
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+913
-284
lines changed
 

‎Cargo.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4404,6 +4404,7 @@ dependencies = [
44044404
"rustc_span",
44054405
"rustc_target",
44064406
"tracing",
4407+
"twox-hash",
44074408
]
44084409

44094410
[[package]]
@@ -5394,6 +5395,17 @@ dependencies = [
53945395
"tracing-subscriber",
53955396
]
53965397

5398+
[[package]]
5399+
name = "twox-hash"
5400+
version = "1.6.3"
5401+
source = "registry+https://github.com/rust-lang/crates.io-index"
5402+
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
5403+
dependencies = [
5404+
"cfg-if 1.0.0",
5405+
"rand 0.8.5",
5406+
"static_assertions",
5407+
]
5408+
53975409
[[package]]
53985410
name = "type-map"
53995411
version = "0.4.0"

‎compiler/rustc_codegen_gcc/src/type_.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,8 @@ impl<'gcc, 'tcx> TypeMembershipMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
300300
// Unsupported.
301301
self.context.new_rvalue_from_int(self.int_type, 0)
302302
}
303+
304+
fn set_kcfi_type_metadata(&self, _function: RValue<'gcc>, _kcfi_typeid: u32) {
305+
// Unsupported.
306+
}
303307
}

0 commit comments

Comments
 (0)
Please sign in to comment.