diff options
Diffstat (limited to 'gcc/rust/backend/rust-compile-resolve-path.cc')
| -rw-r--r-- | gcc/rust/backend/rust-compile-resolve-path.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc index e2c0354..ddb6c91 100644 --- a/gcc/rust/backend/rust-compile-resolve-path.cc +++ b/gcc/rust/backend/rust-compile-resolve-path.cc @@ -166,10 +166,10 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup, if (is_hir_item) { if (!lookup->has_subsititions_defined ()) - return CompileItem::compile (resolved_item, ctx, true, nullptr, true, + return CompileItem::compile (resolved_item, ctx, nullptr, true, expr_locus); else - return CompileItem::compile (resolved_item, ctx, true, lookup, true, + return CompileItem::compile (resolved_item, ctx, lookup, true, expr_locus); } else @@ -194,11 +194,11 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup, rust_assert (ok); if (!lookup->has_subsititions_defined ()) - return CompileInherentImplItem::Compile (resolved_item, ctx, true, + return CompileInherentImplItem::Compile (resolved_item, ctx, nullptr, true, expr_locus); else - return CompileInherentImplItem::Compile (resolved_item, ctx, true, - lookup, true, expr_locus); + return CompileInherentImplItem::Compile (resolved_item, ctx, lookup, + true, expr_locus); } else { @@ -276,13 +276,12 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup, rust_assert (ok); if (!lookup->has_subsititions_defined ()) - return CompileInherentImplItem::Compile (impl_item, ctx, true, + return CompileInherentImplItem::Compile (impl_item, ctx, nullptr, true, expr_locus); else - return CompileInherentImplItem::Compile (impl_item, ctx, true, - lookup, true, - expr_locus); + return CompileInherentImplItem::Compile (impl_item, ctx, lookup, + true, expr_locus); lookup->set_ty_ref (impl_item->get_impl_mappings ().get_hirid ()); } |