---

yaml
---
r: 343293
b: refs/heads/master-rebranch
c: c904a59
h: refs/heads/master
i:
  343291: 21eb460

Author: theblixguy

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 75d482a1f5218059a12d3865dba9d3c5d0568dba
+refs/heads/master-rebranch: c904a59de761ede332239c104c434b830d87e556
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/benchmark/CMakeLists.txt

@@ -87,7 +87,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Exclusivity
     single-source/ExistentialPerformance
     single-source/Fibonacci
-    single-source/FindStringNaive
     single-source/FlattenList
     single-source/FloatingPointParsing
     single-source/FloatingPointPrinting

branches/master-rebranch/benchmark/single-source/FindStringNaive.swift

@@ -75,7 +75,6 @@ import ErrorHandling
 import Exclusivity
 import ExistentialPerformance
 import Fibonacci
-import FindStringNaive
 import FlattenList
 import FloatingPointParsing
 import FloatingPointPrinting
@@ -254,7 +253,6 @@ registerBenchmark(ErrorHandling)
 registerBenchmark(Exclusivity)
 registerBenchmark(ExistentialPerformance)
 registerBenchmark(Fibonacci)
-registerBenchmark(FindStringNaive)
 registerBenchmark(FlattenListLoop)
 registerBenchmark(FlattenListFlatMap)
 registerBenchmark(FloatingPointParsing)

branches/master-rebranch/benchmark/utils/main.swift

@@ -112,10 +112,6 @@ namespace swift {
 
   enum class KnownProtocolKind : uint8_t;
 
-namespace namelookup {
-  class ImportCache;
-}
-
 namespace syntax {
   class SyntaxArena;
 }
@@ -687,9 +683,7 @@ class ASTContext final {
   /// If there is no Clang module loader, returns a null pointer.
   /// The loader is owned by the AST context.
   ClangModuleLoader *getDWARFModuleLoader() const;
-
-  namelookup::ImportCache &getImportCache() const;
-
+  
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.
@@ -826,7 +820,7 @@ class ASTContext final {
   /// of the given decl context.
   ///
   /// \param IDC The context whose member decls should be lazily parsed.
-  std::vector<Decl *> parseMembers(IterableDeclContext *IDC);
+  void parseMembers(IterableDeclContext *IDC);
 
   /// Get the lazy function data for the given generic context.
   ///

branches/master-rebranch/include/swift/AST/ASTContext.h

@@ -33,4 +33,3 @@ SWIFT_TYPEID(AncestryFlags)
 SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
 SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
 SWIFT_TYPEID(Requirement)
-SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)

branches/master-rebranch/include/swift/AST/ASTTypeIDZone.def

@@ -17,26 +17,19 @@
 #ifndef SWIFT_AST_ASTTYPEIDS_H
 #define SWIFT_AST_ASTTYPEIDS_H
 
-#include "swift/Basic/LLVM.h"
 #include "swift/Basic/TypeID.h"
 namespace swift {
 
 class CustomAttr;
-class Decl;
 class GenericSignature;
 class GenericTypeParamType;
-class IterableDeclContext;
 class NominalTypeDecl;
-class OperatorDecl;
 struct PropertyWrapperBackingPropertyInfo;
 struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
 struct PropertyWrapperMutability;
-class ProtocolDecl;
 class Requirement;
-enum class ResilienceExpansion : unsigned;
 class Type;
-class ValueDecl;
 class VarDecl;
 class TypeAliasDecl;
 class Type;

branches/master-rebranch/include/swift/AST/ASTTypeIDs.h

@@ -362,7 +362,8 @@ SIMPLE_DECL_ATTR(_weakLinked, WeakLinked,
   OnSubscript | OnConstructor | OnEnumElement | OnExtension | UserInaccessible,
   75)
 SIMPLE_DECL_ATTR(frozen, Frozen,
-  OnEnum | OnStruct,
+  OnEnum | OnStruct |
+  UserInaccessible,
   76)
 DECL_ATTR_ALIAS(_frozen, Frozen)
 SIMPLE_DECL_ATTR(_forbidSerializingReference, ForbidSerializingReference,

branches/master-rebranch/include/swift/AST/Attr.def

@@ -418,14 +418,6 @@ BUILTIN_MISC_OPERATION(Strideof, "strideof", "n", Special)
 /// IsPOD has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsPOD, "ispod", "n", Special)
 
-/// IsConcrete has type (T.Type) -> Bool
-///
-/// If the meta type T is concrete, we can always transform this to `true` at
-/// any time in SIL. If it's generic, then we lower it to `false` right before
-/// IRGen in IRGenPrepare. This allows for the optimizer to specialize this at
-/// -O and eliminate conditional code.
-BUILTIN_MISC_OPERATION(IsConcrete, "isConcrete", "n", Special)
-
 /// IsBitwiseTakable has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsBitwiseTakable, "isbitwisetakable", "n", Special)
 

branches/master-rebranch/include/swift/AST/Builtins.def

@@ -7248,17 +7248,6 @@ void simple_display(llvm::raw_ostream &out, const Decl *decl);
 /// Display ValueDecl subclasses.
 void simple_display(llvm::raw_ostream &out, const ValueDecl *decl);
 
-/// Display ExtensionDecls.
-inline void simple_display(llvm::raw_ostream &out, const ExtensionDecl *decl) {
-  simple_display(out, static_cast<const Decl *>(decl));
-}
-
-/// Display NominalTypeDecls.
-inline void simple_display(llvm::raw_ostream &out,
-                           const NominalTypeDecl *decl) {
-  simple_display(out, static_cast<const Decl *>(decl));
-}
-
 /// Extract the source location from the given declaration.
 SourceLoc extractNearestSourceLoc(const Decl *decl);
 
@@ -7272,11 +7261,6 @@ inline SourceLoc extractNearestSourceLoc(const GenericTypeDecl *type) {
   return extractNearestSourceLoc(static_cast<const Decl *>(type));
 }
 
-/// Extract the source location from the given declaration.
-inline SourceLoc extractNearestSourceLoc(const NominalTypeDecl *type) {
-  return extractNearestSourceLoc(static_cast<const Decl *>(type));
-}
-
 /// Extract the source location from the given declaration.
 inline SourceLoc extractNearestSourceLoc(const AbstractFunctionDecl *func) {
   return extractNearestSourceLoc(static_cast<const Decl *>(func));

branches/master-rebranch/include/swift/AST/Decl.h

@@ -699,8 +699,8 @@ class IterableDeclContext {
   /// time, but I think it's a better trade to just keep a count here.
   unsigned MemberCount : 29;
 
-  /// Whether we have already added the parsed members into the context.
-  unsigned AddedParsedMembers : 1;
+  /// Whether parsing the members of this context has been delayed.
+  unsigned HasUnparsedMembers : 1;
 
   /// Whether delayed parsing detected a possible operator definition
   /// while skipping the body of this context.
@@ -722,8 +722,8 @@ class IterableDeclContext {
   IterableDeclContext(IterableDeclContextKind kind)
     : LastDeclAndKind(nullptr, kind) {
     MemberCount = 0;
-    AddedParsedMembers = 0;
     HasOperatorDeclarations = 0;
+    HasUnparsedMembers = 0;
     HasNestedClassDeclarations = 0;
   }
 
@@ -732,7 +732,13 @@ class IterableDeclContext {
     return LastDeclAndKind.getInt();
   }
 
-  bool hasUnparsedMembers() const;
+  bool hasUnparsedMembers() const {
+    return HasUnparsedMembers;
+  }
+
+  void setHasUnparsedMembers() {
+    HasUnparsedMembers = 1;
+  }
 
   bool maybeHasOperatorDeclarations() const {
     return HasOperatorDeclarations;
@@ -833,14 +839,9 @@ void simple_display(llvm::raw_ostream &out, const ParamT *dc) {
     out << "(null)";
 }
 
-void simple_display(llvm::raw_ostream &out, const IterableDeclContext *idc);
-
 /// Extract the source location from the given declaration context.
 SourceLoc extractNearestSourceLoc(const DeclContext *dc);
 
-/// Extract the source location from the given declaration context.
-SourceLoc extractNearestSourceLoc(const IterableDeclContext *idc);
-
 } // end namespace swift
 
 namespace llvm {