super_const and comments

rust-lang · Oct 4, 2023 · e3c1139 · e3c1139
1 parent 8bc1355
commit e3c1139
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/compiler/rustc_mir_transform/src/add_subtyping_projections.rs b/compiler/rustc_mir_transform/src/add_subtyping_projections.rs
@@ -24,6 24,8 @@ impl<'a, 'tcx> MutVisitor<'tcx> for SubTypeChecker<'a, 'tcx> {
  rvalue: &mut Rvalue<'tcx>,
  location: Location,
  ) {
  // We don't need to do anything for internal locals as they are
  // not part of the source code, but used for desugaring purposes.
  if self.local_decls[place.local].internal {
  return;
  }

diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs
@@ -482,7 482,7 @@ fn run_runtime_lowering_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
  // These next passes must be executed together
  &add_call_guards::CriticalCallEdges,
  &reveal_all::RevealAll, // has to be done before drop elaboration, since we need to drop opaque types, too.
- &add_subtyping_projections::Subtyper,
  &add_subtyping_projections::Subtyper, // calling this after reveal_all ensures that we don't deal with opaque types
  &elaborate_drops::ElaborateDrops,
  // This will remove extraneous landing pads which are no longer
  // necessary as well as well as forcing any call in a non-unwinding

diff --git a/compiler/rustc_mir_transform/src/reveal_all.rs b/compiler/rustc_mir_transform/src/reveal_all.rs
@@ -50,13 50,14 @@ impl<'tcx> MutVisitor<'tcx> for RevealAllVisitor<'tcx> {
  }
 
  #[inline]
- fn visit_constant(&mut self, constant: &mut ConstOperand<'tcx>, _: Location) {
  fn visit_constant(&mut self, constant: &mut ConstOperand<'tcx>, location: Location) {
  // We have to use `try_normalize_erasing_regions` here, since it's
  // possible that we visit impossible-to-satisfy where clauses here,
  // see #91745
  if let Ok(c) = self.tcx.try_normalize_erasing_regions(self.param_env, constant.const_) {
  constant.const_ = c;
  }
  self.super_constant(constant, location);
  }
 
  #[inline]