Merge pull request #6855 from rintaro/parse-ifconfig-invalid-binary

[Parse] Disallow unsupported condition expression in #if directive

Author: slavapestov

include/swift/AST/DiagnosticsParse.def

@@ -1391,6 +1391,9 @@ ERROR(unexpected_version_comparison_operator,none,
       ())
 ERROR(unsupported_conditional_compilation_expression_type,none,
       "invalid conditional compilation expression", ())
+WARNING(swift3_unsupported_conditional_compilation_expression_type,none,
+        "ignoring invalid conditional compilation expression, "
+        "which will be rejected in future version of Swift", ())
 ERROR(unsupported_conditional_compilation_integer,none,
       "'%0' is not a valid conditional compilation expression, use '%1'",
       (StringRef, StringRef))

lib/Parse/ParseStmt.cpp

@@ -1562,10 +1562,27 @@ Parser::classifyConditionalCompilationExpr(Expr *condition,
               break;
           }
         } else {
-          D.diagnose(SE->getLoc(),
-                     diag::unsupported_conditional_compilation_binary_expression);
+          D.diagnose(
+              SE->getLoc(),
+              diag::unsupported_conditional_compilation_binary_expression);
           return ConditionalCompilationExprState::error();
         }
+      } else {
+        // Swift3 didn't have this branch. the operator and the RHS are
+        // silently ignored.
+        if (!Context.isSwiftVersion3()) {
+          D.diagnose(
+              elements[iOperator]->getLoc(),
+              diag::unsupported_conditional_compilation_expression_type);
+          return ConditionalCompilationExprState::error();
+        } else {
+          SourceRange ignoredRange(elements[iOperator]->getLoc(),
+                                   elements[iOperand]->getEndLoc());
+          D.diagnose(
+              elements[iOperator]->getLoc(),
+              diag::swift3_unsupported_conditional_compilation_expression_type)
+            .highlight(ignoredRange);
+        }
       }
 
       iOperator += 2;

test/Compatibility/conditional_compiliation_expr.swift

@@ -0,0 +1,18 @@
+// RUN: %target-typecheck-verify-swift -D FOO -swift-version 3
+
+
+#if FOO = false
+// expected-warning @-1 {{ignoring invalid conditional compilation expression, which will be rejected in future version of Swift}}
+undefinedFunc() // expected-error {{use of unresolved identifier 'undefinedFunc'}}
+#else
+undefinedFunc() // ignored.
+#endif
+
+#if false
+
+#elseif !FOO ? false : true
+// expected-warning @-1 {{ignoring invalid conditional compilation expression, which will be rejected in future version of Swift}}
+undefinedFunc() // ignored.
+#else
+undefinedFunc() // expected-error {{use of unresolved identifier 'undefinedFunc'}}
+#endif

test/Parse/ConditionalCompilation/basicParseErrors.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -D FOO -D BAZ
+// RUN: %target-typecheck-verify-swift -D FOO -D BAZ -swift-version 4
 
 #if FOO == BAZ // expected-error{{expected '&&' or '||' expression}}
 var x = 0
@@ -88,3 +88,18 @@ fn_j() // OK
 
 #if foo || bar || nonExistent() // expected-error {{expected only one argument to platform condition}}
 #endif
+
+#if FOO = false
+// expected-error @-1 {{invalid conditional compilation expression}}
+undefinedFunc() // ignored.
+#else
+undefinedFunc() // expected-error {{use of unresolved identifier 'undefinedFunc'}}
+#endif
+
+#if false
+#elseif FOO ? true : false
+// expected-error @-1 {{invalid conditional compilation expression}}
+undefinedFunc() // ignored.
+#else
+undefinedFunc() // expected-error {{use of unresolved identifier 'undefinedFunc'}}
+#endif