---

yaml
---
r: 327163
b: refs/heads/tensorflow
c: a7888f0
h: refs/heads/master
i:
  327161: a73f35a
  327159: 09602ef

Author: drodriguez

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 016acf3ac9061c22d39ab75cae817cd3f5565f7c
+refs/heads/tensorflow: a7888f0720d783925fb0084612fd4f0075afdfaf
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/include/swift/AST/ASTContext.h

@@ -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.

branches/tensorflow/include/swift/AST/Builtins.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/tensorflow/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -96,8 +96,6 @@ ERROR(decl_new_witness_table_entry,none,"%0 now requires %select{|no}1 new witne
 
 ERROR(new_decl_without_intro,none,"%0 is a new API without @available attribute", (StringRef))
 
-ERROR(objc_name_change,none,"%0 has ObjC name change from %1 to %2", (StringRef, StringRef, StringRef))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/tensorflow/include/swift/AST/ImportCache.h

@@ -42,25 +42,24 @@ enum class ResolutionKind {
   TypesOnly
 };
 
-/// Performs a lookup into the given module and it's imports.
-///
-/// If 'moduleOrFile' is a ModuleDecl, we search the module and it's
-/// public imports. If 'moduleOrFile' is a SourceFile, we search the
-/// file's parent module, the module's public imports, and the source
-/// file's private imports.
+/// Performs a lookup into the given module and, if necessary, its
+/// reexports, observing proper shadowing rules.
 ///
-/// \param moduleOrFile The module or file unit whose imports to search.
+/// \param module The module that will contain the name.
+/// \param accessPath The import scope on \p module.
 /// \param name The name to look up.
 /// \param[out] decls Any found decls will be added to this vector.
 /// \param lookupKind Whether this lookup is qualified or unqualified.
 /// \param resolutionKind What sort of decl is expected.
 /// \param moduleScopeContext The top-level context from which the lookup is
 ///        being performed, for checking access. This must be either a
 ///        FileUnit or a Module.
-void lookupInModule(const DeclContext *moduleOrFile,
+/// \param extraImports Private imports to include in this search.
+void lookupInModule(ModuleDecl *module, ModuleDecl::AccessPathTy accessPath,
                     DeclName name, SmallVectorImpl<ValueDecl *> &decls,
                     NLKind lookupKind, ResolutionKind resolutionKind,
-                    const DeclContext *moduleScopeContext);
+                    const DeclContext *moduleScopeContext,
+                    ArrayRef<ModuleDecl::ImportedModule> extraImports = {});
 
 template <typename Fn>
 void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
@@ -75,12 +74,12 @@ void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
 /// Performs a qualified lookup into the given module and, if necessary, its
 /// reexports, observing proper shadowing rules.
 void
-lookupVisibleDeclsInModule(const DeclContext *moduleOrFile,
-                           ModuleDecl::AccessPathTy accessPath,
+lookupVisibleDeclsInModule(ModuleDecl *M, ModuleDecl::AccessPathTy accessPath,
                            SmallVectorImpl<ValueDecl *> &decls,
                            NLKind lookupKind,
                            ResolutionKind resolutionKind,
-                           const DeclContext *moduleScopeContext);
+                           const DeclContext *moduleScopeContext,
+                           ArrayRef<ModuleDecl::ImportedModule> extraImports = {});
 
 } // end namespace namelookup
 

branches/tensorflow/include/swift/AST/ModuleNameLookup.h

@@ -378,11 +378,11 @@ bool removeOverriddenDecls(SmallVectorImpl<ValueDecl*> &decls);
 /// other declarations in that set.
 ///
 /// \param decls The set of declarations being considered.
-/// \param dc The DeclContext from which the lookup was performed.
+/// \param curModule The current module.
 ///
 /// \returns true if any shadowed declarations were removed.
 bool removeShadowedDecls(SmallVectorImpl<ValueDecl*> &decls,
-                         const DeclContext *dc);
+                         const ModuleDecl *curModule);
 
 /// Finds decls visible in the given context and feeds them to the given
 /// VisibleDeclConsumer.  If the current DeclContext is nested in a function,

branches/tensorflow/include/swift/AST/NameLookup.h

@@ -259,7 +259,7 @@ namespace swift {
     bool WarnIfASTScopeLookup = false;
 
     /// Build the ASTScope tree lazily
-    bool LazyASTScopes = true;
+    bool LazyASTScopes = false;
 
     /// Whether to use the import as member inference system
     ///

branches/tensorflow/include/swift/Basic/LangOptions.h

@@ -175,19 +175,6 @@ FRONTEND_STATISTIC(AST, NumBraceStmtASTScopeExpansions)
 /// Number of ASTScope lookups
 FRONTEND_STATISTIC(AST, NumASTScopeLookups)
 
-/// Number of lookups of the cached import graph for a module or
-/// source file.
-FRONTEND_STATISTIC(AST, ImportSetFoldHit)
-FRONTEND_STATISTIC(AST, ImportSetFoldMiss)
-
-FRONTEND_STATISTIC(AST, ImportSetCacheHit)
-FRONTEND_STATISTIC(AST, ImportSetCacheMiss)
-
-FRONTEND_STATISTIC(AST, ModuleVisibilityCacheHit)
-FRONTEND_STATISTIC(AST, ModuleVisibilityCacheMiss)
-
-FRONTEND_STATISTIC(AST, ModuleShadowCacheHit)
-FRONTEND_STATISTIC(AST, ModuleShadowCacheMiss)
 
 /// Number of full function bodies parsed.
 FRONTEND_STATISTIC(Parse, NumFunctionsParsed)

branches/tensorflow/include/swift/Basic/Statistics.def

@@ -297,6 +297,7 @@ class CompilerInvocation {
   /// Called from lldb, see rdar://53971116
   void disableASTScopeLookup() {
     LangOpts.EnableASTScopeLookup = false;
+    LangOpts.LazyASTScopes = false;
   }
 
   CodeCompletionCallbacksFactory *getCodeCompletionFactory() const {

branches/tensorflow/include/swift/Frontend/Frontend.h

@@ -151,7 +151,6 @@ KEY_STRING(IntroiOS, intro_iOS)
 KEY_STRING(IntrotvOS, intro_tvOS)
 KEY_STRING(IntrowatchOS, intro_watchOS)
 KEY_STRING(Introswift, intro_swift)
-KEY_STRING(ObjCName, objc_name)
 
 KEY_STRING_ARR(SuperclassNames, superclassNames)
 KEY_STRING_ARR(ToolArgs, tool_arguments)

branches/tensorflow/include/swift/IDE/DigesterEnums.def

@@ -66,7 +66,6 @@ struct IndexSymbol : IndexRelation {
   SmallVector<IndexRelation, 3> Relations;
   unsigned line = 0;
   unsigned column = 0;
-  Optional<unsigned> offset;
 
   IndexSymbol() = default;
 

branches/tensorflow/include/swift/Index/IndexSymbol.h

@@ -25,7 +25,6 @@
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/GenericSignatureBuilder.h"
-#include "swift/AST/ImportCache.h"
 #include "swift/AST/KnownProtocols.h"
 #include "swift/AST/LazyResolver.h"
 #include "swift/AST/ModuleLoader.h"
@@ -253,9 +252,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
   /// ASTContext.
   SmallVector<std::unique_ptr<swift::ModuleLoader>, 4> ModuleLoaders;
 
-  /// Singleton used to cache the import graph.
-  swift::namelookup::ImportCache TheImportCache;
-
   /// The module loader used to load Clang modules.
   ClangModuleLoader *TheClangModuleLoader = nullptr;
 
@@ -1498,10 +1494,6 @@ void ASTContext::verifyAllLoadedModules() const {
 #endif
 }
 
-swift::namelookup::ImportCache &ASTContext::getImportCache() const {
-  return getImpl().TheImportCache;
-}
-
 ClangModuleLoader *ASTContext::getClangModuleLoader() const {
   return getImpl().TheClangModuleLoader;
 }