Merge pull request #5440 from graydon/rdar-28786959-if-swift-3-digit-version

Author: swift-ci

include/swift/Parse/Parser.h

@@ -122,6 +122,7 @@ class Parser {
   } InVarOrLetPattern = IVOLP_NotInVarOrLet;
 
   bool InPoundLineEnvironment = false;
+  bool InPoundIfEnvironment = false;
 
   LocalContext *CurLocalContext = nullptr;
 

lib/Basic/Version.cpp

@@ -314,7 +314,11 @@ bool Version::isValidEffectiveLanguageVersion() const {
   for (auto verStr : getValidEffectiveVersions()) {
     auto v = parseVersionString(verStr, SourceLoc(), nullptr);
     assert(v.hasValue());
-    if (v == *this)
+    // In this case, use logical-equality _and_ precision-equality. We do not
+    // want to permit users requesting effective language versions more precise
+    // than our whitelist (eg. we permit 3 but not 3.0 or 3.0.0), since
+    // accepting such an argument promises more than we're able to deliver.
+    if (v == *this && v.getValue().size() == size())
       return true;
   }
   return false;
@@ -336,23 +340,27 @@ bool operator>=(const class Version &lhs,
   if (lhs.empty())
     return true;
 
-  auto n = std::min(lhs.size(), rhs.size());
+  auto n = std::max(lhs.size(), rhs.size());
 
   for (size_t i = 0; i < n; ++i) {
-    if (lhs[i] < rhs[i])
+    auto lv = i < lhs.size() ? lhs[i] : 0;
+    auto rv = i < rhs.size() ? rhs[i] : 0;
+    if (lv < rv)
       return false;
-    else if (lhs[i] > rhs[i])
+    else if (lv > rv)
       return true;
   }
-  return lhs.size() >= rhs.size();
+  // Equality
+  return true;
 }
 
 bool operator==(const class Version &lhs,
                 const class Version &rhs) {
-  if (lhs.size() != rhs.size())
-    return false;
-  for (size_t i = 0; i < lhs.size(); ++i) {
-    if (lhs[i] != rhs[i])
+  auto n = std::max(lhs.size(), rhs.size());
+  for (size_t i = 0; i < n; ++i) {
+    auto lv = i < lhs.size() ? lhs[i] : 0;
+    auto rv = i < rhs.size() ? rhs[i] : 0;
+    if (lv != rv)
       return false;
   }
   return true;

lib/Parse/ParseExpr.cpp

@@ -1429,8 +1429,9 @@ ParserResult<Expr> Parser::parseExprPostfix(Diag<> ID, bool isExprBasic) {
         SourceLoc nameLoc = consumeToken(tok::integer_literal);
 
         // Don't allow '.<integer literal>' following a numeric literal
-        // expression.
-        if (Result.isNonNull() && isa<NumberLiteralExpr>(Result.get())) {
+        // expression (unless in #if env, for 1.2.3.4 version numbers)
+        if (!InPoundIfEnvironment &&
+            Result.isNonNull() && isa<NumberLiteralExpr>(Result.get())) {
           diagnose(nameLoc, diag::numeric_literal_numeric_member)
             .highlight(Result.get()->getSourceRange());
           continue;

lib/Parse/ParseStmt.cpp

@@ -1759,7 +1759,7 @@ Parser::evaluateConditionalCompilationExpr(Expr *condition) {
 ParserResult<Stmt> Parser::parseStmtIfConfig(BraceItemListKind Kind) {
   StructureMarkerRAII ParsingDecl(*this, Tok.getLoc(),
                                   StructureMarkerKind::IfConfig);
-
+  llvm::SaveAndRestore<bool> S(InPoundIfEnvironment, true);
   ConditionalCompilationExprState ConfigState;
   bool foundActive = false;
   SmallVector<IfConfigStmtClause, 4> Clauses;

test/Parse/ConditionalCompilation/language_version.swift

@@ -43,8 +43,7 @@
 #if swift("") // expected-error {{unexpected platform condition argument: expected a unary comparison, such as '>=2.2'}}
 #endif
 
-// We won't expect three version components to work for now.
-#if swift(>=2.2.1) // expected-error {{expected named member of numeric literal}}
+#if swift(>=2.2.1)
 #endif
 
 #if swift(>=2.0, *) // expected-error {{expected only one argument to platform condition}}

test/Parse/ConditionalCompilation/language_version_explicit.swift

@@ -7,3 +7,24 @@
   asdf asdf asdf asdf
 #endif
 
+#if swift(>=4.0)
+  let x = 1
+#else
+  // This shouldn't emit any diagnostics.
+  asdf asdf asdf asdf
+#endif
+
+#if swift(>=4.0.0)
+  let y = 1
+#else
+  // This shouldn't emit any diagnostics.
+  asdf asdf asdf asdf
+#endif
+
+#if swift(>=4.0.1)
+  // This shouldn't emit any diagnostics.
+  asdf asdf asdf asdf
+#else
+  let z = 1
+#endif
+