aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/backend/rust-compile-base.cc
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-03-04 11:58:45 +0000
committerGitHub <noreply@github.com>2022-03-04 11:58:45 +0000
commitd89c8ccf3237e66029125c0fe007297bb86eca74 (patch)
tree24926ddec8217cdba774a50eaa06383c8a72d13e /gcc/rust/backend/rust-compile-base.cc
parentb4bd389c66a3e3bf0489626a1a70c2500d415ef8 (diff)
parentd6e1771291c792f665f5b9ed7d065bf292051e6a (diff)
downloadgcc-d89c8ccf3237e66029125c0fe007297bb86eca74.zip
gcc-d89c8ccf3237e66029125c0fe007297bb86eca74.tar.gz
gcc-d89c8ccf3237e66029125c0fe007297bb86eca74.tar.bz2
Merge #990
990: Add must use attribute support r=philberty a=philberty This is a port of the CPP front-end nodiscard attribute to be used for must_use. It contains a patch to clean up how we handle expressions vs statements and removes more of the GCC abstraction. Its my hope that we can leverage more and more existing code to get the static analysis where we want it. Fixes #856 Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-base.cc')
-rw-r--r--gcc/rust/backend/rust-compile-base.cc43
1 files changed, 36 insertions, 7 deletions
diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc
index 33e4c26..a705da7 100644
--- a/gcc/rust/backend/rust-compile-base.cc
+++ b/gcc/rust/backend/rust-compile-base.cc
@@ -22,6 +22,8 @@
#include "rust-compile-fnparam.h"
#include "rust-compile-var-decl.h"
+#include "rust-expr.h" // for AST::AttrInputLiteral
+
#include "fold-const.h"
#include "stringpool.h"
@@ -52,10 +54,16 @@ HIRCompileBase::setup_attributes_on_fndecl (
for (const auto &attr : attrs)
{
bool is_inline = attr.get_path ().as_string ().compare ("inline") == 0;
+ bool is_must_use
+ = attr.get_path ().as_string ().compare ("must_use") == 0;
if (is_inline)
{
handle_inline_attribute_on_fndecl (fndecl, attr);
}
+ else if (is_must_use)
+ {
+ handle_must_use_attribute_on_fndecl (fndecl, attr);
+ }
}
}
@@ -108,6 +116,30 @@ HIRCompileBase::handle_inline_attribute_on_fndecl (tree fndecl,
}
void
+HIRCompileBase::handle_must_use_attribute_on_fndecl (tree fndecl,
+ const AST::Attribute &attr)
+{
+ tree nodiscard = get_identifier ("nodiscard");
+ tree value = NULL_TREE;
+
+ if (attr.has_attr_input ())
+ {
+ rust_assert (attr.get_attr_input ().get_attr_input_type ()
+ == AST::AttrInput::AttrInputType::LITERAL);
+
+ auto &literal
+ = static_cast<AST::AttrInputLiteral &> (attr.get_attr_input ());
+ const auto &msg_str = literal.get_literal ().as_string ();
+ tree message = build_string (msg_str.size (), msg_str.c_str ());
+
+ value = tree_cons (nodiscard, message, NULL_TREE);
+ }
+
+ DECL_ATTRIBUTES (fndecl)
+ = tree_cons (nodiscard, value, DECL_ATTRIBUTES (fndecl));
+}
+
+void
HIRCompileBase::setup_abi_options (tree fndecl, ABI abi)
{
switch (abi)
@@ -262,9 +294,8 @@ HIRCompileBase::compile_function_body (Context *ctx, tree fndecl,
auto compiled_expr = CompileStmt::Compile (s.get (), ctx);
if (compiled_expr != nullptr)
{
- tree compiled_stmt
- = ctx->get_backend ()->expression_statement (fndecl, compiled_expr);
- ctx->add_statement (compiled_stmt);
+ tree s = convert_to_void (compiled_expr, ICV_STATEMENT);
+ ctx->add_statement (s);
}
}
@@ -289,10 +320,8 @@ HIRCompileBase::compile_function_body (Context *ctx, tree fndecl,
}
else
{
- tree final_stmt
- = ctx->get_backend ()->expression_statement (fndecl,
- compiled_expr);
- ctx->add_statement (final_stmt);
+ // FIXME can this actually happen?
+ ctx->add_statement (compiled_expr);
}
}
}