From 886d56d0c54ec73cabae64558f63e7963c9bb90a Mon Sep 17 00:00:00 2001 From: Owen Avery Date: Mon, 10 Jul 2023 20:15:19 -0400 Subject: gccrs: Remove Location typedef gcc/rust/ChangeLog: * rust-location.h (typedef Location): Remove. * expand/rust-proc-macro.cc (register_callback): Replace Location constructor with UNDEF_LOCATION. * ast/rust-ast-collector.h: Replace Location with location_t. * checks/errors/privacy/rust-privacy-reporter.cc: Likewise. * checks/errors/privacy/rust-privacy-reporter.h: Likewise. * checks/errors/privacy/rust-pub-restricted-visitor.cc: Likewise. * checks/errors/privacy/rust-pub-restricted-visitor.h: Likewise. * checks/errors/rust-feature-gate.cc: Likewise. * checks/errors/rust-feature-gate.h: Likewise. * metadata/rust-imports.h: Likewise. * resolve/rust-ast-resolve-path.h: Likewise. * resolve/rust-name-resolver.h: Likewise. * rust-backend.h: Likewise. * rust-diagnostics.h: Likewise. * rust-gcc.cc: Likewise. * rust-linemap.h: Likewise. * util/rust-attributes.cc: Likewise. * util/rust-hir-map.cc: Likewise. * util/rust-hir-map.h: Likewise. * util/rust-token-converter.cc: Likewise. Signed-off-by: Owen Avery --- gcc/rust/rust-gcc.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gcc/rust/rust-gcc.cc') diff --git a/gcc/rust/rust-gcc.cc b/gcc/rust/rust-gcc.cc index 119b02d..a6a67bb 100644 --- a/gcc/rust/rust-gcc.cc +++ b/gcc/rust/rust-gcc.cc @@ -186,7 +186,8 @@ public: tree arithmetic_or_logical_expression_checked (ArithmeticOrLogicalOperator op, tree left, tree right, - Location, Bvariable *receiver); + location_t, + Bvariable *receiver); tree comparison_expression (ComparisonOperator op, tree left, tree right, location_t); @@ -231,7 +232,7 @@ public: // Blocks. - tree block (tree, tree, const std::vector &, Location, + tree block (tree, tree, const std::vector &, location_t, location_t); void block_add_statements (tree, const std::vector &); @@ -255,7 +256,7 @@ public: Bvariable *static_chain_variable (tree, const std::string &, tree, location_t); - Bvariable *temporary_variable (tree, tree, tree, tree, bool, Location, + Bvariable *temporary_variable (tree, tree, tree, tree, bool, location_t, tree *); // Labels. @@ -783,7 +784,7 @@ Gcc_backend::function_type_varadic ( tree Gcc_backend::function_ptr_type (tree result_type, const std::vector ¶meters, - Location /* locus */) + location_t /* locus */) { tree args = NULL_TREE; tree *pp = &args; @@ -2084,7 +2085,7 @@ Gcc_backend::statement_list (const std::vector &statements) tree Gcc_backend::block (tree fndecl, tree enclosing, const std::vector &vars, - Location start_location, location_t) + location_t start_location, location_t) { tree block_tree = make_node (BLOCK); if (enclosing == NULL) -- cgit v1.1