---

yaml
---
r: 348815
b: refs/heads/master
c: 55a6693
h: refs/heads/master
i:
  348813: a782c4b
  348811: f6d58e7
  348807: 704e5a9
  348799: eecd3a2

Author: slavapestov

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 951c6261f37d1ab1384133e99caead6943abd2e0
+refs/heads/master: 55a6693da84c7743ed5aa978e0b9ad98965af061
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/CMakeLists.txt

@@ -125,7 +125,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.1.1")
+set(SWIFT_VERSION "5.1")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")

trunk/include/swift/Parse/ASTGen.h

@@ -67,8 +67,10 @@ class ASTGen {
 
 private:
   DeclAttributes
-  generateDeclAttributes(const syntax::Syntax &D, SourceLoc Loc,
-                         bool includeComments);
+  generateDeclAttributes(const syntax::DeclSyntax &D,
+                         const Optional<syntax::AttributeListSyntax> &attrs,
+                         const Optional<syntax::ModifierListSyntax> &modifiers,
+                         SourceLoc Loc, bool includeComments);
 
   void generateFreeStandingGenericWhereClause(
                                 const syntax::GenericWhereClauseSyntax &syntax,

trunk/lib/FrontendTool/FrontendTool.cpp

@@ -406,7 +406,8 @@ static bool writeSIL(SILModule &SM, ModuleDecl *M, bool EmitVerboseSIL,
   auto OS = getFileOutputStream(OutputFilename, M->getASTContext());
   if (!OS) return true;
   SM.print(*OS, EmitVerboseSIL, M, SortSIL);
-  return false;
+
+  return M->getASTContext().hadError();
 }
 
 static bool writeSIL(SILModule &SM, const PrimarySpecificPaths &PSPs,

trunk/lib/Parse/ASTGen.cpp

@@ -57,14 +57,21 @@ Decl *ASTGen::generate(const DeclSyntax &D, const SourceLoc Loc) {
 }
 
 DeclAttributes
-ASTGen::generateDeclAttributes(const Syntax &D, SourceLoc Loc,
-                               bool includeComments) {
-  // Find the AST attribute-list from the lookup table.
-  if (auto firstTok = D.getFirstToken()) {
-    auto declLoc = advanceLocBegin(Loc, *firstTok);
-    if (hasDeclAttributes(declLoc))
-      return getDeclAttributes(declLoc);
+ASTGen::generateDeclAttributes(const DeclSyntax &D,
+                               const Optional<AttributeListSyntax> &attrs,
+                               const Optional<ModifierListSyntax> &modifiers,
+                               SourceLoc Loc, bool includeComments) {
+  SourceLoc attrsLoc;
+  if (attrs) {
+    attrsLoc = advanceLocBegin(Loc, *attrs->getFirstToken());
+  } else if (modifiers) {
+    attrsLoc = advanceLocBegin(Loc, *modifiers->getFirstToken());
+  } else {
+    // We might have comment attributes.
+    attrsLoc = advanceLocBegin(Loc, *D.getFirstToken());
   }
+  if (hasDeclAttributes(attrsLoc))
+    return getDeclAttributes(attrsLoc);
   return DeclAttributes();
 }
 
@@ -104,7 +111,8 @@ TypeDecl *ASTGen::generate(const AssociatedtypeDeclSyntax &D,
   Identifier name;
   SourceLoc nameLoc = generateIdentifierDeclName(idToken, Loc, name);
 
-  DeclAttributes attrs = generateDeclAttributes(D, Loc, true);
+  DeclAttributes attrs =
+      generateDeclAttributes(D, D.getAttributes(), D.getModifiers(), Loc, true);
 
   DebuggerContextChange DCC(P, name, DeclKind::AssociatedType);
 
@@ -139,7 +147,8 @@ TypeDecl *ASTGen::generate(const TypealiasDeclSyntax &D, const SourceLoc Loc) {
   auto keywordLoc = advanceLocBegin(Loc, D.getTypealiasKeyword());
   Identifier name;
   SourceLoc nameLoc = generateIdentifierDeclName(idToken, Loc, name);
-  auto attrs = generateDeclAttributes(D, Loc, true);
+  auto attrs =
+      generateDeclAttributes(D, D.getAttributes(), D.getModifiers(), Loc, true);
   SourceLoc equalLoc;
 
   DebuggerContextChange DCC(P, name, DeclKind::TypeAlias);
@@ -977,7 +986,14 @@ GenericParamList *ASTGen::generate(const GenericParameterClauseSyntax &clause,
 
   for (auto elem : clause.getGenericParameterList()) {
 
-    DeclAttributes attrs = generateDeclAttributes(elem, Loc, false);
+    DeclAttributes attrs;
+    if (auto attrsSyntax = elem.getAttributes()) {
+      if (auto firstTok = attrsSyntax->getFirstToken()) {
+        auto attrsLoc = advanceLocBegin(Loc, *firstTok);
+        if (hasDeclAttributes(attrsLoc))
+          attrs = getDeclAttributes(attrsLoc);
+      }
+    }
     Identifier name = Context.getIdentifier(elem.getName().getIdentifierText());
     SourceLoc nameLoc = advanceLocBegin(Loc, elem.getName());
 

trunk/lib/Parse/ParseDecl.cpp

@@ -2714,7 +2714,6 @@ Parser::parseDecl(ParseDeclOptions Flags,
                                   StructureMarkerKind::Declaration);
 
   // Parse attributes.
-  SourceLoc AttrsLoc = Tok.getLoc();
   DeclAttributes Attributes;
   if (Tok.hasComment())
     Attributes.add(new (Context) RawDocCommentAttr(Tok.getCommentRange()));
@@ -2726,8 +2725,12 @@ Parser::parseDecl(ParseDeclOptions Flags,
   StaticSpellingKind StaticSpelling = StaticSpellingKind::None;
   parseDeclModifierList(Attributes, StaticLoc, StaticSpelling);
 
-  if (!Attributes.isEmpty())
-    Generator.addDeclAttributes(Attributes, AttrsLoc);
+  if (!Attributes.isEmpty()) {
+    auto startLoc = Attributes.getStartLoc();
+    if (startLoc.isInvalid())
+      startLoc = Tok.getLoc();
+    Generator.addDeclAttributes(Attributes, startLoc);
+  }
 
   // We emit diagnostics for 'try let ...' in parseDeclVar().
   SourceLoc tryLoc;

trunk/lib/Parse/ParseGeneric.cpp

@@ -78,11 +78,10 @@ Parser::parseGenericParameterClauseSyntax() {
       SyntaxParsingContext TmpCtxt(SyntaxContext);
       TmpCtxt.setTransparent();
 
-      auto AttrsLoc = Tok.getLoc();
       DeclAttributes attrsAST;
       parseDeclAttributeList(attrsAST);
       if (!attrsAST.isEmpty())
-        Generator.addDeclAttributes(attrsAST, AttrsLoc);
+        Generator.addDeclAttributes(attrsAST, attrsAST.getStartLoc());
       auto attrs = SyntaxContext->popIf<ParsedAttributeListSyntax>();
       if (attrs)
         paramBuilder.useAttributes(std::move(*attrs));

trunk/lib/SIL/SILOwnershipVerifier.cpp

@@ -642,20 +642,10 @@ void SILValue::verifyOwnership(DeadEndBlocks *deadEndBlocks) const {
   if (DisableOwnershipVerification)
     return;
 
-  // Do not validate SILUndef values.
-  if (isa<SILUndef>(Value))
-    return;
-
 #ifdef NDEBUG
   // When compiling without asserts enabled, only verify ownership if
   // -sil-verify-all is set.
-  //
-  // NOTE: We purposely return if we do can not look up a module here to ensure
-  // that if we run into something that we do not understand, we do not assert
-  // in user code even tohugh we aren't going to actually verify (the default
-  // behavior when -sil-verify-all is disabled).
-  auto *Mod = Value->getModule();
-  if (!Mod || !Mod->getOptions().VerifyAll)
+  if (!getModule().getOptions().VerifyAll)
     return;
 #endif
 

trunk/test/Parse/attr_available_ignored.swift

@@ -16,8 +16,8 @@ import Lib
 func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
 func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
 
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.1.1) because it has overridable members that could not be loaded in Swift 4.1.50}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.1.1) because it has requirements that could not be loaded in Swift 4.1.50}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.1) because it has overridable members that could not be loaded in Swift 4.1.50}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.1) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 

trunk/test/Serialization/Recovery/types-5-to-4.swift

@@ -2,4 +2,4 @@
 
 // CHECK: key.version_major: 5
 // CHECK: key.version_minor: 1
-// CHECK: key.version_patch: 1
+// CHECK: key.version_patch: 0

trunk/test/SourceKit/Misc/compiler_version.swift

@@ -40,7 +40,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1.1')
+SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1')
 CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'