mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #114821 - matthiaskrgr:rollup-bahtz9m, r=matthiaskrgr

Browse Source 
Rollup of 5 pull requests

Successful merges:

 - #114745 (Make Const more useful in smir)
 - #114752 (fixed *const [type error] does not implement the Copy trait)
 - #114760 (DebugInfo: Updates test cases that add method declarations.)
 - #114815 (Update books)
 - #114817 (Remove unnecessary FIXME)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2023-08-14 20:01:12 +00:00
commit f960bdf1fe
12 changed files with 71 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/check/intrinsicck.rs
View File

@ -68,7 +68,7 @@ impl<'a, 'tcx> InlineAsmCtxt<'a, 'tcx> {
let asm_ty = match *ty.kind() {
// `!` is allowed for input but not for output (issue #87802)
ty::Never if is_input => return None,
ty::Error(_) => return None,
_ if ty.references_error() => return None,
ty::Int(IntTy::I8) | ty::Uint(UintTy::U8) => Some(InlineAsmType::I8),
ty::Int(IntTy::I16) | ty::Uint(UintTy::U16) => Some(InlineAsmType::I16),
ty::Int(IntTy::I32) | ty::Uint(UintTy::U32) => Some(InlineAsmType::I32),

1
compiler/rustc_mir_build/src/thir/cx/expr.rs
View File

@ -445,7 +445,6 @@ impl<'tcx> Cx<'tcx> {
let rhs = self.mirror_expr(rhs);
self.overloaded_operator(expr, Box::new([lhs, rhs]))
} else {
// FIXME overflow
match op.node {
hir::BinOpKind::And => ExprKind::LogicalOp {
op: LogicalOp::And,

23
compiler/rustc_smir/src/rustc_smir/mod.rs
View File

@ -10,7 +10,7 @@
use crate::rustc_internal::{self, opaque};
use crate::stable_mir::mir::{CopyNonOverlapping, UserTypeProjection, VariantIdx};
use crate::stable_mir::ty::{
allocation_filter, new_allocation, FloatTy, IntTy, Movability, RigidTy, TyKind, UintTy,
allocation_filter, new_allocation, Const, FloatTy, IntTy, Movability, RigidTy, TyKind, UintTy,
};
use crate::stable_mir::{self, Context};
use rustc_hir as hir;
@ -187,7 +187,11 @@ impl<'tcx> Stable<'tcx> for mir::Rvalue<'tcx> {
use mir::Rvalue::*;
match self {
Use(op) => stable_mir::mir::Rvalue::Use(op.stable(tables)),
Repeat(op, len) => stable_mir::mir::Rvalue::Repeat(op.stable(tables), opaque(len)),
Repeat(op, len) => {
let cnst = ConstantKind::from_const(*len, tables.tcx);
let len = Const { literal: cnst.stable(tables) };
stable_mir::mir::Rvalue::Repeat(op.stable(tables), len)
}
Ref(region, kind, place) => stable_mir::mir::Rvalue::Ref(
opaque(region),
kind.stable(tables),
@ -372,7 +376,11 @@ impl<'tcx> Stable<'tcx> for ty::TermKind<'tcx> {
use stable_mir::ty::TermKind;
match self {
ty::TermKind::Ty(ty) => TermKind::Type(tables.intern_ty(*ty)),
ty::TermKind::Const(const_) => TermKind::Const(opaque(const_)),
ty::TermKind::Const(cnst) => {
let cnst = ConstantKind::from_const(*cnst, tables.tcx);
let cnst = Const { literal: cnst.stable(tables) };
TermKind::Const(cnst)
}
}
}
}
@ -829,7 +837,10 @@ impl<'tcx> Stable<'tcx> for ty::GenericArgKind<'tcx> {
match self {
ty::GenericArgKind::Lifetime(region) => GenericArgKind::Lifetime(opaque(region)),
ty::GenericArgKind::Type(ty) => GenericArgKind::Type(tables.intern_ty(*ty)),
ty::GenericArgKind::Const(const_) => GenericArgKind::Const(opaque(&const_)),
ty::GenericArgKind::Const(cnst) => {
let cnst = ConstantKind::from_const(*cnst, tables.tcx);
GenericArgKind::Const(stable_mir::ty::Const { literal: cnst.stable(tables) })
}
}
}
}
@ -1035,7 +1046,9 @@ impl<'tcx> Stable<'tcx> for Ty<'tcx> {
}
ty::Str => TyKind::RigidTy(RigidTy::Str),
ty::Array(ty, constant) => {
TyKind::RigidTy(RigidTy::Array(tables.intern_ty(*ty), opaque(constant)))
let cnst = ConstantKind::from_const(*constant, tables.tcx);
let cnst = stable_mir::ty::Const { literal: cnst.stable(tables) };
TyKind::RigidTy(RigidTy::Array(tables.intern_ty(*ty), cnst))
}
ty::Slice(ty) => TyKind::RigidTy(RigidTy::Slice(tables.intern_ty(*ty))),
ty::RawPtr(ty::TypeAndMut { ty, mutbl }) => {

6
compiler/rustc_smir/src/stable_mir/ty.rs
View File

@ -15,7 +15,11 @@ impl Ty {
}
}
pub(crate) type Const = Opaque;
#[derive(Debug, Clone)]
pub struct Const {
pub literal: ConstantKind,
}
type Ident = Opaque;
pub(crate) type Region = Opaque;
type Span = Opaque;

2
src/doc/book

@ -1 +1 @@
Subproject commit 668c64760b5c7ea654facb4ba5fe9faddfda27cc
Subproject commit 72187f5cd0beaaa9c6f584156bcd88f921871e83

2
src/doc/embedded-book

@ -1 +1 @@
Subproject commit 1e5556dd1b864109985d5871616ae6b9164bcead
Subproject commit 99ad2847b865e96d8ae7b333d3ee96963557e621

2
src/doc/nomicon

@ -1 +1 @@
Subproject commit 302b995bcb24b70fd883980fd174738c3a10b705
Subproject commit 388750b081c0893c275044d37203f97709e058ba

2
src/doc/reference

@ -1 +1 @@
Subproject commit 9cd5c5a6ccbd4c07c65ab5c69a53286280308c95
Subproject commit d43038932adeb16ada80e206d4c073d851298101

2
src/doc/rustc-dev-guide

@ -1 +1 @@
Subproject commit 24eebb6df96d037aad285e4f7793bd0393a66878
Subproject commit b123ab4754127d822ffb38349ce0fbf561f1b2fd

26
tests/codegen/method-declaration.rs Normal file
View File

@ -0,0 +1,26 @@
// compile-flags: -g -Cno-prepopulate-passes
// Verify that we added a declaration for a method.
// CHECK: define{{.*}}@method{{.*}} !dbg ![[METHOD_DEF_DBG:[0-9]+]]
// CHECK: define{{.*}}@function{{.*}} !dbg ![[FUNC_DEF_DBG:[0-9]+]]
#![crate_type = "lib"]
// CHECK-DAG: ![[FOO_DBG:[0-9]+]] = !DICompositeType(tag: {{.*}} name: "Foo", {{.*}} identifier:
pub struct Foo;
impl Foo {
// CHECK-DAG: ![[METHOD_DEF_DBG]] = distinct !DISubprogram(name: "method"{{.*}}, scope: ![[FOO_DBG]]{{.*}}DISPFlagDefinition{{.*}}, declaration: ![[METHOD_DECL_DBG:[0-9]+]]
// CHECK-DAG: ![[METHOD_DECL_DBG]] = !DISubprogram(name: "method"{{.*}}, scope: ![[FOO_DBG]]
#[no_mangle]
pub fn method() {}
}
// CHECK: ![[FUNC_DEF_DBG]] = distinct !DISubprogram(name: "function"
// CHECK-NOT: declaration
// CHECK-SAME: DISPFlagDefinition
// CHECK-NOT: declaration
// CHECK-SAME: )
#[no_mangle]
pub fn function() {}

7
tests/ui/asm/issue-113788.rs Normal file
View File

@ -0,0 +1,7 @@
// test that "error: arguments for inline assembly must be copyable" doesn't show up in this code
// needs-asm-support
// only-x86_64
fn main() {
let peb: *const PEB; //~ ERROR cannot find type `PEB` in this scope [E0412]
unsafe { std::arch::asm!("mov {0}, fs:[0x30]", out(reg) peb); }
}

9
tests/ui/asm/issue-113788.stderr Normal file
View File

@ -0,0 +1,9 @@
error[E0412]: cannot find type `PEB` in this scope
--> $DIR/issue-113788.rs:5:21
|
LL | let peb: *const PEB;
| ^^^ not found in this scope
error: aborting due to previous error
For more information about this error, try `rustc --explain E0412`.