[PATCH v2 4/5] fixup: change `ordering` to `model`

[0xllx0 via Sourceware Forge]

From: Elle Rhumsaa <e...@weathered-steel.dev>

---
 gcc/rust/backend/rust-intrinsic-handlers.cc | 10 +++++-----
 gcc/rust/backend/rust-intrinsic-handlers.h  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/rust/backend/rust-intrinsic-handlers.cc 
b/gcc/rust/backend/rust-intrinsic-handlers.cc
index 78e05f828414..41d95899461e 100644
--- a/gcc/rust/backend/rust-intrinsic-handlers.cc
+++ b/gcc/rust/backend/rust-intrinsic-handlers.cc
@@ -755,7 +755,7 @@ atomic_load (Context *ctx, TyTy::FnType *fntype, int 
ordering)
 }
 
 tree
-atomic_exchange (Context *ctx, TyTy::FnType *fntype, memmodel ordering)
+atomic_exchange (Context *ctx, TyTy::FnType *fntype, memmodel model)
 {
   rust_assert (fntype->get_params ().size () == 2);
   rust_assert (fntype->get_num_substitutions () == 1);
@@ -784,7 +784,7 @@ atomic_exchange (Context *ctx, TyTy::FnType *fntype, 
memmodel ordering)
   TREE_READONLY (dst) = 0;
 
   auto value = Backend::var_expression (param_vars[1], UNDEF_LOCATION);
-  auto memorder = make_memmodel_tree (ordering);
+  auto memorder = make_memmodel_tree (model);
 
   auto monomorphized_type
     = fntype->get_substs ()[0].get_param_ty ()->resolve ();
@@ -1141,10 +1141,10 @@ atomic_load (int ordering)
 }
 
 HandlerBuilder
-atomic_exchange (memmodel ordering)
+atomic_exchange (memmodel model)
 {
-  return [ordering] (Context *ctx, TyTy::FnType *fntype) {
-    return inner::atomic_exchange (ctx, fntype, ordering);
+  return [model] (Context *ctx, TyTy::FnType *fntype) {
+    return inner::atomic_exchange (ctx, fntype, model);
   };
 }
 
diff --git a/gcc/rust/backend/rust-intrinsic-handlers.h 
b/gcc/rust/backend/rust-intrinsic-handlers.h
index e5ce4481c5d7..c169d901ef8e 100644
--- a/gcc/rust/backend/rust-intrinsic-handlers.h
+++ b/gcc/rust/backend/rust-intrinsic-handlers.h
@@ -37,7 +37,7 @@ tree wrapping_op (Context *ctx, TyTy::FnType *fntype, 
tree_code op);
 
 tree atomic_store (Context *ctx, TyTy::FnType *fntype, int ordering);
 tree atomic_load (Context *ctx, TyTy::FnType *fntype, int ordering);
-tree atomic_exchange (Context *ctx, TyTy::FnType *fntype, memmodel ordering);
+tree atomic_exchange (Context *ctx, TyTy::FnType *fntype, memmodel model);
 inline tree copy (Context *ctx, TyTy::FnType *fntype, bool overlaps);
 inline tree expect (Context *ctx, TyTy::FnType *fntype, bool likely);
 tree try_handler (Context *ctx, TyTy::FnType *fntype, bool is_new_api);
@@ -80,7 +80,7 @@ HandlerBuilder atomic_store (int ordering);
 
 HandlerBuilder atomic_load (int ordering);
 
-HandlerBuilder atomic_exchange (memmodel ordering);
+HandlerBuilder atomic_exchange (memmodel model);
 
 const HandlerBuilder unchecked_op (tree_code op);
 
-- 
2.54.0