Merge #883

883: Extract AsyncConstStatus to be a shared enum between AST and HIR r=philberty a=philberty

This allows us to reuse the same enum and fix the uninitilized warning
as it has already been setup before hand in the AST.

Fixes #875

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/gcc/rust/hir/rust-ast-lower.cc b/gcc/rust/hir/rust-ast-lower.cc
index d6f5cf2..87fc523 100644
--- a/gcc/rust/hir/rust-ast-lower.cc
+++ b/gcc/rust/hir/rust-ast-lower.cc
@@ -597,20 +597,6 @@ struct_field_name_exists (std::vector<HIR::StructField> &fields,
 HIR::FunctionQualifiers
 ASTLoweringBase::lower_qualifiers (const AST::FunctionQualifiers &qualifiers)
 {
-  HIR::FunctionQualifiers::AsyncConstStatus const_status;
-  switch (qualifiers.get_const_status ())
-    {
-    case AST::FunctionQualifiers::AsyncConstStatus::NONE:
-      const_status = HIR::FunctionQualifiers::AsyncConstStatus::NONE;
-      break;
-    case AST::FunctionQualifiers::AsyncConstStatus::CONST:
-      const_status = HIR::FunctionQualifiers::AsyncConstStatus::CONST;
-      break;
-    case AST::FunctionQualifiers::AsyncConstStatus::ASYNC:
-      const_status = HIR::FunctionQualifiers::AsyncConstStatus::ASYNC;
-      break;
-    }
-
   Unsafety unsafety
     = qualifiers.is_unsafe () ? Unsafety::Unsafe : Unsafety::Normal;
   bool has_extern = qualifiers.is_extern ();
@@ -618,8 +604,8 @@ ASTLoweringBase::lower_qualifiers (const AST::FunctionQualifiers &qualifiers)
   // FIXME turn this into the Rust::ABI enum
   std::string extern_abi = qualifiers.get_extern_abi ();
 
-  return HIR::FunctionQualifiers (const_status, unsafety, has_extern,
-				  extern_abi);
+  return HIR::FunctionQualifiers (qualifiers.get_const_status (), unsafety,
+				  has_extern, extern_abi);
 }
 
 } // namespace HIR