[flang] address review comments from part 4

Original-commit: flang-compiler/f18@64408ede56a47de39c84094655bfec08538b5744
Reviewed-on: https://github.com/flang-compiler/f18/pull/296
Tree-same-pre-rewrite: false

diff --git a/flang/lib/IntermediateRepresentation/common.h b/flang/lib/IntermediateRepresentation/common.h
index 8066c6a..1b76f86 100644 (file)
--- a/flang/lib/IntermediateRepresentation/common.h
+++ b/flang/lib/IntermediateRepresentation/common.h
@@ -61,6 +61,7 @@ struct Variable {
   common::OverMembers<GVT, evaluate::AllIntrinsicTypes>::type u;
 };
 #endif
+
 using Variable = const semantics::Symbol *;
 using PathVariable = const parser::Variable;
 using Scope = const semantics::Scope;
@@ -104,4 +105,4 @@ enum RuntimeCallType {
 using RuntimeCallArguments = CallArguments;
 }
 
-#endif
+#endif  // FORTRAN_INTERMEDIATEREPRESENTATION_COMMON_H_

diff --git a/flang/lib/IntermediateRepresentation/mixin.h b/flang/lib/IntermediateRepresentation/mixin.h
index a970d82..f011f9c 100644 (file)
--- a/flang/lib/IntermediateRepresentation/mixin.h
+++ b/flang/lib/IntermediateRepresentation/mixin.h
@@ -24,7 +24,7 @@
 namespace Fortran::IntermediateRepresentation {
 
 template<typename T, typename E = void> struct SumTypeMixin {};
-template<typename T>  // T must be std::optional<...>
+template<typename T>  // T must be std::variant<...>
 struct SumTypeMixin<T, std::enable_if_t<std::variant_size_v<T>>> {
   template<typename A> SumTypeMixin(A &&x) : u{std::move(x)} {}
   using SumTypeTrait = std::true_type;
@@ -37,7 +37,7 @@ struct SumTypeMixin<T, std::enable_if_t<std::variant_size_v<T>>> {
 };
 
 template<typename T, typename E = void> struct SumTypeCopyMixin {};
-template<typename T>  // T must be std::optional<...>
+template<typename T>  // T must be std::variant<...>
 struct SumTypeCopyMixin<T, std::enable_if_t<std::variant_size_v<T>>> {
   using CopyableSumTypeTrait = std::true_type;
   SumTypeCopyMixin(SumTypeCopyMixin &&) = default;
@@ -111,4 +111,4 @@ template<typename A, typename B> B &Unzip(B &out, A first, A last) {
 
 }
 
-#endif
+#endif  // FORTRAN_INTERMEDIATEREPRESENTATION_COMMON_H_