Some more from-the-hip ctad-maybe-unsupported fixes for flang

flang/include/flang/Evaluate/expression.h

@@ -263,6 +263,14 @@ struct ComplexComponent
   bool isImaginaryPart{true};
 };
 
+template <int KIND>
+ComplexComponent(bool, const Expr<Type<TypeCategory::Complex, KIND>> &)
+    -> ComplexComponent<KIND>;
+
+template <int KIND>
+ComplexComponent(bool, Expr<Type<TypeCategory::Complex, KIND>> &&)
+    -> ComplexComponent<KIND>;
+
 template <int KIND>
 struct Not : public Operation<Not<KIND>, Type<TypeCategory::Logical, KIND>,
                  Type<TypeCategory::Logical, KIND>> {

flang/include/flang/Parser/instrumented-parser.h

@@ -75,6 +75,10 @@ private:
   const PA parser_;
 };
 
+template <typename PA>
+InstrumentedParser(const MessageFixedText &, const PA &)
+    -> InstrumentedParser<PA>;
+
 template <typename PA>
 inline constexpr auto instrumented(
     const MessageFixedText &tag, const PA &parser) {

flang/lib/Parser/basic-parsers.h

@@ -193,6 +193,9 @@ private:
   const PA parser_;
 };
 
+template <typename PA>
+MessageContextParser(MessageFixedText, PA) -> MessageContextParser<PA>;
+
 template <typename PA>
 inline constexpr auto inContext(MessageFixedText context, PA parser) {
   return MessageContextParser{context, parser};
@@ -241,6 +244,9 @@ private:
   const PA parser_;
 };
 
+template <typename PA>
+WithMessageParser(MessageFixedWidth, PA) -> WithMessageParser<PA>;
+
 template <typename PA>
 inline constexpr auto withMessage(MessageFixedText msg, PA parser) {
   return WithMessageParser{msg, parser};