aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/rust/backend/rust-compile-context.h7
-rw-r--r--gcc/rust/backend/rust-compile-implitem.h24
-rw-r--r--gcc/rust/backend/rust-compile-item.h17
-rw-r--r--gcc/rust/backend/rust-compile-stmt.h5
4 files changed, 31 insertions, 22 deletions
diff --git a/gcc/rust/backend/rust-compile-context.h b/gcc/rust/backend/rust-compile-context.h
index 4147eec..2b2018f 100644
--- a/gcc/rust/backend/rust-compile-context.h
+++ b/gcc/rust/backend/rust-compile-context.h
@@ -53,11 +53,12 @@ public:
for (auto it = builtins.begin (); it != builtins.end (); it++)
{
HirId ref;
- rust_assert (
- tyctx->lookup_type_by_node_id ((*it)->get_node_id (), &ref));
+ bool ok = tyctx->lookup_type_by_node_id ((*it)->get_node_id (), &ref);
+ rust_assert (ok);
TyTy::BaseType *lookup;
- rust_assert (tyctx->lookup_type (ref, &lookup));
+ ok = tyctx->lookup_type (ref, &lookup);
+ rust_assert (ok);
Btype *compiled = TyTyCompile::compile (backend, lookup);
compiled_type_map.insert (std::pair<HirId, Btype *> (ref, compiled));
diff --git a/gcc/rust/backend/rust-compile-implitem.h b/gcc/rust/backend/rust-compile-implitem.h
index e27ecd3..a78cf19 100644
--- a/gcc/rust/backend/rust-compile-implitem.h
+++ b/gcc/rust/backend/rust-compile-implitem.h
@@ -67,9 +67,10 @@ public:
Bexpression *value = CompileExpr::Compile (constant.get_expr (), ctx);
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ ok = ctx->get_mappings ()->lookup_canonical_path (
constant.get_mappings ().get_crate_num (),
- constant.get_mappings ().get_nodeid (), &canonical_path));
+ constant.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ident = canonical_path->get ();
Bexpression *const_expr = ctx->get_backend ()->named_constant_expression (
@@ -148,9 +149,10 @@ public:
flags |= Backend::function_is_visible;
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ bool ok = ctx->get_mappings ()->lookup_canonical_path (
function.get_mappings ().get_crate_num (),
- function.get_mappings ().get_nodeid (), &canonical_path));
+ function.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ir_symbol_name
= canonical_path->get () + fntype->subst_as_string ();
@@ -260,7 +262,7 @@ public:
}
std::vector<Bvariable *> locals;
- bool ok = compile_locals_for_block (*rib, fndecl, locals);
+ ok = compile_locals_for_block (*rib, fndecl, locals);
rust_assert (ok);
Bblock *enclosing_scope = NULL;
@@ -358,9 +360,10 @@ public:
= CompileExpr::Compile (constant.get_expr ().get (), ctx);
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ bool ok = ctx->get_mappings ()->lookup_canonical_path (
constant.get_mappings ().get_crate_num (),
- constant.get_mappings ().get_nodeid (), &canonical_path));
+ constant.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ident = canonical_path->get ();
Bexpression *const_expr = ctx->get_backend ()->named_constant_expression (
@@ -413,9 +416,10 @@ public:
unsigned int flags = 0;
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ bool ok = ctx->get_mappings ()->lookup_canonical_path (
func.get_mappings ().get_crate_num (), func.get_mappings ().get_nodeid (),
- &canonical_path));
+ &canonical_path);
+ rust_assert (ok);
std::string fn_identifier = canonical_path->get ();
std::string asm_name = ctx->mangle_item (fntype, *canonical_path);
@@ -522,7 +526,7 @@ public:
}
std::vector<Bvariable *> locals;
- bool ok = compile_locals_for_block (*rib, fndecl, locals);
+ ok = compile_locals_for_block (*rib, fndecl, locals);
rust_assert (ok);
Bblock *enclosing_scope = NULL;
diff --git a/gcc/rust/backend/rust-compile-item.h b/gcc/rust/backend/rust-compile-item.h
index d79ab55..b64f6f0 100644
--- a/gcc/rust/backend/rust-compile-item.h
+++ b/gcc/rust/backend/rust-compile-item.h
@@ -68,9 +68,10 @@ public:
Bexpression *value = CompileExpr::Compile (var.get_expr (), ctx);
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ ok = ctx->get_mappings ()->lookup_canonical_path (
var.get_mappings ().get_crate_num (), var.get_mappings ().get_nodeid (),
- &canonical_path));
+ &canonical_path);
+ rust_assert (ok);
std::string name = canonical_path->get ();
std::string asm_name = ctx->mangle_item (resolved_type, *canonical_path);
@@ -103,9 +104,10 @@ public:
Bexpression *value = CompileExpr::Compile (constant.get_expr (), ctx);
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ ok = ctx->get_mappings ()->lookup_canonical_path (
constant.get_mappings ().get_crate_num (),
- constant.get_mappings ().get_nodeid (), &canonical_path));
+ constant.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ident = canonical_path->get ();
Bexpression *const_expr
@@ -186,9 +188,10 @@ public:
flags |= Backend::function_is_visible;
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ bool ok = ctx->get_mappings ()->lookup_canonical_path (
function.get_mappings ().get_crate_num (),
- function.get_mappings ().get_nodeid (), &canonical_path));
+ function.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ir_symbol_name
= canonical_path->get () + fntype->subst_as_string ();
@@ -259,7 +262,7 @@ public:
}
std::vector<Bvariable *> locals;
- bool ok = compile_locals_for_block (*rib, fndecl, locals);
+ ok = compile_locals_for_block (*rib, fndecl, locals);
rust_assert (ok);
Bblock *enclosing_scope = NULL;
diff --git a/gcc/rust/backend/rust-compile-stmt.h b/gcc/rust/backend/rust-compile-stmt.h
index 21e5814..754c5d2 100644
--- a/gcc/rust/backend/rust-compile-stmt.h
+++ b/gcc/rust/backend/rust-compile-stmt.h
@@ -60,9 +60,10 @@ public:
Bexpression *value = CompileExpr::Compile (constant.get_expr (), ctx);
const Resolver::CanonicalPath *canonical_path = nullptr;
- rust_assert (ctx->get_mappings ()->lookup_canonical_path (
+ ok = ctx->get_mappings ()->lookup_canonical_path (
constant.get_mappings ().get_crate_num (),
- constant.get_mappings ().get_nodeid (), &canonical_path));
+ constant.get_mappings ().get_nodeid (), &canonical_path);
+ rust_assert (ok);
std::string ident = canonical_path->get ();
Bexpression *const_expr
generated by cgit v1.1 at 2025-08-10 22:26:39 +0000