diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-09-10 14:44:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 14:44:42 +0000 |
| commit | e3b7eb58844c446d097ddee00ecd455d5537c6b2 (patch) | |
| tree | 30186abaf20b28e107b78a93cddba7143c68d2b8 /gcc/rust/backend/rust-compile-implitem.h | |
| parent | 2bf19c1b20bfad19136e17c0c7fa765e161b789c (diff) | |
| parent | 0c409fcf5678709303126aba07932f9f2a8519da (diff) | |
| download | gcc-e3b7eb58844c446d097ddee00ecd455d5537c6b2.zip gcc-e3b7eb58844c446d097ddee00ecd455d5537c6b2.tar.gz gcc-e3b7eb58844c446d097ddee00ecd455d5537c6b2.tar.bz2 | |
Merge #669
669: Fix bug with monomorphizing of trait items r=philberty a=philberty
When we monomorphize functions we need to check if we have already
generated this function already. All function items have a DefId which is
unique for the crate and HIR item this means for generic implementations
of an item we end up with mappings of:
DefId -> [ (concete-tyty-fntype, GCC::Function), ... ]
So for any function we can lookup for that DefId is there a suitable
version of this function already compiled. This was working untill we have
generic trait items which also need to be handled in the same way.
Fixes #668
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-implitem.h')
| -rw-r--r-- | gcc/rust/backend/rust-compile-implitem.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/rust/backend/rust-compile-implitem.h b/gcc/rust/backend/rust-compile-implitem.h index bdeda22..1d3ad02 100644 --- a/gcc/rust/backend/rust-compile-implitem.h +++ b/gcc/rust/backend/rust-compile-implitem.h @@ -113,7 +113,8 @@ public: // items can be forward compiled which means we may not need to invoke this // code. We might also have already compiled this generic function as well. Bfunction *lookup = nullptr; - if (ctx->lookup_function_decl (fntype->get_ty_ref (), &lookup, fntype)) + if (ctx->lookup_function_decl (fntype->get_ty_ref (), &lookup, + fntype->get_id (), fntype)) { // has this been added to the list then it must be finished if (ctx->function_completed (lookup)) @@ -121,8 +122,7 @@ public: Bfunction *dummy = nullptr; if (!ctx->lookup_function_decl (fntype->get_ty_ref (), &dummy)) { - ctx->insert_function_decl (fntype->get_ty_ref (), lookup, - fntype); + ctx->insert_function_decl (fntype, lookup); } reference = ctx->get_backend ()->function_code_expression (lookup, @@ -160,7 +160,7 @@ public: Bfunction *fndecl = ctx->get_backend ()->function (compiled_fn_type, ir_symbol_name, asm_name, flags, function.get_locus ()); - ctx->insert_function_decl (fntype->get_ty_ref (), fndecl, fntype); + ctx->insert_function_decl (fntype, fndecl); // setup the params TyTy::BaseType *tyret = fntype->get_return_type (); @@ -381,7 +381,8 @@ public: // items can be forward compiled which means we may not need to invoke this // code. We might also have already compiled this generic function as well. Bfunction *lookup = nullptr; - if (ctx->lookup_function_decl (fntype->get_ty_ref (), &lookup)) + if (ctx->lookup_function_decl (fntype->get_ty_ref (), &lookup, + fntype->get_id (), fntype)) { // has this been added to the list then it must be finished if (ctx->function_completed (lookup)) @@ -389,8 +390,7 @@ public: Bfunction *dummy = nullptr; if (!ctx->lookup_function_decl (fntype->get_ty_ref (), &dummy)) { - ctx->insert_function_decl (fntype->get_ty_ref (), lookup, - fntype); + ctx->insert_function_decl (fntype, lookup); } reference = ctx->get_backend ()->function_code_expression (lookup, @@ -422,7 +422,7 @@ public: Bfunction *fndecl = ctx->get_backend ()->function (compiled_fn_type, fn_identifier, asm_name, flags, func.get_locus ()); - ctx->insert_function_decl (fntype->get_ty_ref (), fndecl, fntype); + ctx->insert_function_decl (fntype, fndecl); // setup the params TyTy::BaseType *tyret = fntype->get_return_type (); |