diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2023-08-31 15:58:22 -0400 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 19:04:32 +0100 |
| commit | 83feca39ba06e865ee4588e607a27e498944f62d (patch) | |
| tree | 723297a2d9f0cc4fd22725d403ee985634af57ab /gcc | |
| parent | b1c722d1411448e00d45bb4da0aca2421dcd54e0 (diff) | |
| download | gcc-83feca39ba06e865ee4588e607a27e498944f62d.zip gcc-83feca39ba06e865ee4588e607a27e498944f62d.tar.gz gcc-83feca39ba06e865ee4588e607a27e498944f62d.tar.bz2 | |
gccrs: Move block-related methods into base class Backend
gcc/rust/ChangeLog:
* rust-backend.h
(Backend::block): Make non-virtual.
(Backend::block_add_statements): Likewise.
(Gcc_backend::block): Remove.
(Gcc_backend::block_add_statements): Remove.
* rust-gcc.cc
(Gcc_backend::block): Rename to ...
(Backend::block): ... here.
(Gcc_backend::block_add_statements): Rename to ...
(Backend::block_add_statements): ... here.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/rust-backend.h | 16 | ||||
| -rw-r--r-- | gcc/rust/rust-gcc.cc | 10 |
2 files changed, 9 insertions, 17 deletions
diff --git a/gcc/rust/rust-backend.h b/gcc/rust/rust-backend.h index 6b265cc..082f6b9 100644 --- a/gcc/rust/rust-backend.h +++ b/gcc/rust/rust-backend.h @@ -326,16 +326,15 @@ public: // the initial curly brace. END_LOCATION is the location of the end // of the block, more or less the location of the final curly brace. // The statements will be added after the block is created. - virtual tree block (tree function, tree enclosing, - const std::vector<Bvariable *> &vars, - location_t start_location, location_t end_location) - = 0; + tree block (tree function, tree enclosing, + const std::vector<Bvariable *> &vars, location_t start_location, + location_t end_location); // Add the statements to a block. The block is created first. Then // the statements are created. Then the statements are added to the // block. This will called exactly once per block. The vector may // be empty if there are no statements. - virtual void block_add_statements (tree, const std::vector<tree> &) = 0; + void block_add_statements (tree, const std::vector<tree> &); // Variables. @@ -536,13 +535,6 @@ public: tree call_expression (tree fn, const std::vector<tree> &args, tree static_chain, location_t); - - // Blocks. - - tree block (tree, tree, const std::vector<Bvariable *> &, location_t, - location_t); - - void block_add_statements (tree, const std::vector<tree> &); }; #endif // RUST_BACKEND_H diff --git a/gcc/rust/rust-gcc.cc b/gcc/rust/rust-gcc.cc index 7ef442b..330772f 100644 --- a/gcc/rust/rust-gcc.cc +++ b/gcc/rust/rust-gcc.cc @@ -1867,9 +1867,9 @@ Backend::statement_list (const std::vector<tree> &statements) // the Bblock. tree -Gcc_backend::block (tree fndecl, tree enclosing, - const std::vector<Bvariable *> &vars, - location_t start_location, location_t) +Backend::block (tree fndecl, tree enclosing, + const std::vector<Bvariable *> &vars, location_t start_location, + location_t) { tree block_tree = make_node (BLOCK); if (enclosing == NULL) @@ -1928,8 +1928,8 @@ Gcc_backend::block (tree fndecl, tree enclosing, // Add statements to a block. void -Gcc_backend::block_add_statements (tree bind_tree, - const std::vector<tree> &statements) +Backend::block_add_statements (tree bind_tree, + const std::vector<tree> &statements) { tree stmt_list = NULL_TREE; for (std::vector<tree>::const_iterator p = statements.begin (); |