[flang-commits] [flang] e2333b5 - Revert "Some more from-the-hip ctad-maybe-unsupported fixes for flang"

[David Blaikie via flang-commits]

Author: David Blaikie
Date: 2022-08-16T17:43:08Z
New Revision: e2333b5550b5d279d32c9b936a5a4f60da2964a2

URL: https://github.com/llvm/llvm-project/commit/e2333b5550b5d279d32c9b936a5a4f60da2964a2
DIFF: https://github.com/llvm/llvm-project/commit/e2333b5550b5d279d32c9b936a5a4f60da2964a2.diff

LOG: Revert "Some more from-the-hip ctad-maybe-unsupported fixes for flang"

-Wctad-maybe-unsupported is now disabled for flang so these explicit
deduction guides are not required.

This reverts commit ec3956b6e63c1524d6b024ba5db9ffcd7281ada0.

Added: 
    

Modified: 
    flang/include/flang/Evaluate/expression.h
    flang/include/flang/Parser/instrumented-parser.h
    flang/lib/Parser/basic-parsers.h

Removed: 
    


################################################################################
diff  --git a/flang/include/flang/Evaluate/expression.h b/flang/include/flang/Evaluate/expression.h
index bce5fc6750b7d..90309affbe257 100644
--- a/flang/include/flang/Evaluate/expression.h
+++ b/flang/include/flang/Evaluate/expression.h
@@ -263,14 +263,6 @@ 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>> {

diff  --git a/flang/include/flang/Parser/instrumented-parser.h b/flang/include/flang/Parser/instrumented-parser.h
index 1770744ac7144..9d958b97c9b0a 100644
--- a/flang/include/flang/Parser/instrumented-parser.h
+++ b/flang/include/flang/Parser/instrumented-parser.h
@@ -75,10 +75,6 @@ template <typename PA> class InstrumentedParser {
   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) {

diff  --git a/flang/lib/Parser/basic-parsers.h b/flang/lib/Parser/basic-parsers.h
index 330ede9582637..e2355a7526ae8 100644
--- a/flang/lib/Parser/basic-parsers.h
+++ b/flang/lib/Parser/basic-parsers.h
@@ -193,9 +193,6 @@ template <typename PA> class MessageContextParser {
   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};
@@ -244,9 +241,6 @@ template <typename PA> class WithMessageParser {
   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};