Add optional template arguments to please GCC4.8

Clang on macos as well as GCC 4.8 complains when those templates are
missing.

gcc/rust/ChangeLog:

	* hir/rust-ast-lower-expr.cc (ASTLoweringExpr::visit): Add template
	to tl::optional.
	* hir/rust-ast-lower-type.cc (ASTLowerGenericParam::visit): Likewise.
	* typecheck/rust-hir-type-check-type.cc (TypeResolveGenericParam::visit):
	Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

diff --git a/gcc/rust/hir/rust-ast-lower-expr.cc b/gcc/rust/hir/rust-ast-lower-expr.cc
index fb24a72efa707c7525cfacc45bfecf42e5ed8b9a..a8c07303bd1c3106f1c41fd2a689cbee75d4c5ee 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-expr.cc
+++ b/gcc/rust/hir/rust-ast-lower-expr.cc
@@ -517,8 +517,9 @@ ASTLoweringExpr::visit (AST::StructExprStructFields &struct_expr)
     {
       HIR::Expr *translated_base = ASTLoweringExpr::translate (
        struct_expr.get_struct_base ().get_base_struct ());
-      base = tl::optional (Rust::make_unique<StructBase> (
-       std::unique_ptr<HIR::Expr> (translated_base)));
+      base = tl::optional<std::unique_ptr<HIR::StructBase>> (
+       Rust::make_unique<StructBase> (
+         std::unique_ptr<HIR::Expr> (translated_base)));
     }
 
   auto const &in_fields = struct_expr.get_fields ();

diff --git a/gcc/rust/hir/rust-ast-lower-type.cc b/gcc/rust/hir/rust-ast-lower-type.cc
index c1bfe213aa1737093eed2a276f216f5076adc513..553c9c9612da9d3e05258fe468a21d2c4747656c 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-type.cc
+++ b/gcc/rust/hir/rust-ast-lower-type.cc
@@ -503,9 +503,11 @@ ASTLowerGenericParam::visit (AST::TypeParam &param)
        }
     }
 
-  auto type = param.has_type () ? tl::optional (std::unique_ptr<HIR::Type> (
-               ASTLoweringType::translate (param.get_type ())))
-                               : tl::nullopt;
+  tl::optional<std::unique_ptr<HIR::Type>> type = tl::nullopt;
+  if (param.has_type ())
+    type
+      = tl::optional<std::unique_ptr<HIR::Type>> (std::unique_ptr<HIR::Type> (
+       ASTLoweringType::translate (param.get_type ())));
 
   auto crate_num = mappings.get_current_crate ();
   Analysis::NodeMapping mapping (crate_num, param.get_node_id (),

diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.cc b/gcc/rust/typecheck/rust-hir-type-check-type.cc
index 099a08910e8d8d41c67c9e6d36046adc07b942f6..e0b70976a617956e09f9dc43381e112433973730 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-type.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-type.cc
@@ -829,7 +829,9 @@ TypeResolveGenericParam::visit (HIR::TypeParam &param)
                HIR::TraitBound &b = static_cast<HIR::TraitBound &> (*bound);
 
                TyTy::TypeBoundPredicate predicate = get_predicate_from_bound (
-                 b.get_path (), tl::optional (std::ref (*implicit_self_bound)),
+                 b.get_path (),
+                 tl::optional<std::reference_wrapper<HIR::Type>> (
+                   std::ref (*implicit_self_bound)),
                  b.get_polarity ());
                if (!predicate.is_error ())
                  {