---

yaml
---
r: 349131
b: refs/heads/master
c: f90930f
h: refs/heads/master
i:
  349129: 5c36c58
  349127: b5f8afa

Author: CodaFi

[refs]

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

trunk/include/swift/SIL/SILDeclRef.h

@@ -249,11 +249,6 @@ struct SILDeclRef {
   bool isStoredPropertyInitializer() const {
     return kind == Kind::StoredPropertyInitializer;
   }
-  /// True if the SILDeclRef references the initializer for the backing storage
-  /// of a property wrapper.
-  bool isPropertyWrapperBackingInitializer() const {
-    return kind == Kind::PropertyWrapperBackingInitializer;
-  }
 
   /// True if the SILDeclRef references the ivar initializer or deinitializer of
   /// a class.

trunk/lib/Frontend/Frontend.cpp

@@ -318,23 +318,6 @@ void CompilerInstance::setUpDiagnosticOptions() {
   }
 }
 
-// The ordering of ModuleLoaders is important!
-//
-// 1. SourceLoader: This is a hack and only the compiler's tests are using it,
-//    to avoid writing repetitive code involving generating modules/interfaces.
-//    Ideally, we'd get rid of it.
-// 2. MemoryBufferSerializedModuleLoader: This is used by LLDB, because it might
-//    already have the module available in memory.
-// 3. ModuleInterfaceLoader: Tries to find an up-to-date swiftmodule. If it
-//    succeeds, it issues a particular "error" (see
-//    [Note: ModuleInterfaceLoader-defer-to-SerializedModuleLoader]), which
-//    is interpreted by the overarching loader as a command to use the
-//    SerializedModuleLoader. If we failed to find a .swiftmodule, this falls
-//    back to using an interface. Actual errors lead to diagnostics.
-// 4. SerializedModuleLoader: Loads a serialized module if it can.
-// 5. ClangImporter: This must come after all the Swift module loaders because
-//    in the presence of overlays and mixed-source frameworks, we want to prefer
-//    the overlay or framework module over the underlying Clang module.
 bool CompilerInstance::setUpModuleLoaders() {
   if (hasSourceImport()) {
     bool enableLibraryEvolution =
@@ -371,6 +354,10 @@ bool CompilerInstance::setUpModuleLoaders() {
     Context->addModuleLoader(std::move(MemoryBufferLoader));
   }
 
+  std::unique_ptr<SerializedModuleLoader> SML =
+    SerializedModuleLoader::create(*Context, getDependencyTracker(), MLM);
+  this->SML = SML.get();
+
   // Wire up the Clang importer. If the user has specified an SDK, use it.
   // Otherwise, we just keep it around as our interface to Clang's ABI
   // knowledge.
@@ -393,12 +380,7 @@ bool CompilerInstance::setUpModuleLoaders() {
         FEOpts.RemarkOnRebuildFromModuleInterface);
     Context->addModuleLoader(std::move(PIML));
   }
-
-  std::unique_ptr<SerializedModuleLoader> SML =
-    SerializedModuleLoader::create(*Context, getDependencyTracker(), MLM);
-  this->SML = SML.get();
   Context->addModuleLoader(std::move(SML));
-
   Context->addModuleLoader(std::move(clangImporter), /*isClang*/ true);
 
   return false;

trunk/lib/Frontend/ModuleInterfaceLoader.cpp

@@ -764,7 +764,6 @@ class ModuleInterfaceLoaderImpl {
       }
     }
 
-    // [Note: ModuleInterfaceLoader-defer-to-SerializedModuleLoader]
     // Finally, if there's a module adjacent to the .swiftinterface that we can
     // _likely_ load (it validates OK and is up to date), bail early with
     // errc::not_supported, so the next (serialized) loader in the chain will

trunk/lib/SIL/SILProfiler.cpp

@@ -135,7 +135,6 @@ static bool canCreateProfilerForAST(ASTNode N, SILDeclRef forDecl) {
       return true;
   } else if (auto *E = N.get<Expr *>()) {
     if (forDecl.isStoredPropertyInitializer() ||
-        forDecl.isPropertyWrapperBackingInitializer() ||
         forDecl.getAbstractClosureExpr())
       return true;
   }
@@ -152,10 +151,8 @@ SILProfiler *SILProfiler::create(SILModule &M, ForDefinition_t forDefinition,
   if (!doesASTRequireProfiling(M, N) && Opts.UseProfile.empty())
     return nullptr;
 
-  if (!canCreateProfilerForAST(N, forDecl)) {
-    N.dump(llvm::errs());
+  if (!canCreateProfilerForAST(N, forDecl))
     llvm_unreachable("Invalid AST node for profiling");
-  }
 
   auto *Buf = M.allocate<SILProfiler>(1);
   auto *SP =

trunk/lib/SILGen/SILGen.cpp

@@ -1145,11 +1145,10 @@ emitPropertyWrapperBackingInitializer(VarDecl *var) {
     preEmitFunction(constant, var, f, var);
     PrettyStackTraceSILFunction X(
         "silgen emitPropertyWrapperBackingInitializer", f);
+    f->createProfiler(var, constant, ForDefinition);
+    auto varDC = var->getInnermostDeclContext();
     auto wrapperInfo = var->getPropertyWrapperBackingPropertyInfo();
     assert(wrapperInfo.initializeFromOriginal);
-    f->createProfiler(wrapperInfo.initializeFromOriginal, constant,
-                      ForDefinition);
-    auto varDC = var->getInnermostDeclContext();
     SILGenFunction SGF(*this, *f, varDC);
     SGF.emitGeneratorFunction(constant, wrapperInfo.initializeFromOriginal);
     postEmitFunction(constant, f);

trunk/lib/Sema/TypeCheckConstraints.cpp

@@ -1119,7 +1119,8 @@ namespace {
         return finish(walkToClosureExprPre(closure), expr);
 
       if (auto unresolved = dyn_cast<UnresolvedDeclRefExpr>(expr)) {
-        TC.checkForForbiddenPrefix(unresolved);
+        TypeChecker::checkForForbiddenPrefix(
+            TC.Context, unresolved->getName().getBaseName());
         return finish(true, TC.resolveDeclRefExpr(unresolved, DC));
       }
 

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -2211,6 +2211,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     if (auto VD = dyn_cast<ValueDecl>(decl)) {
       auto &Context = TC.Context;
+      TypeChecker::checkForForbiddenPrefix(Context, VD->getBaseName());
+      
       checkRedeclaration(Context, VD);
 
       // Force some requests, which can produce diagnostics.
@@ -3594,7 +3596,6 @@ bool TypeChecker::isAvailabilitySafeForConformance(
 }
 
 void TypeChecker::typeCheckDecl(Decl *D) {
-  checkForForbiddenPrefix(D);
   DeclChecker(*this).visit(D);
 }
 
@@ -4127,7 +4128,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
   PrettyStackTraceDecl StackTrace("validating", D);
   FrontendStatsTracer StatsTracer(Context.Stats, "validate-decl", D);
 
-  checkForForbiddenPrefix(D);
+  TypeChecker::checkForForbiddenPrefix(Context, D->getBaseName());
 
   if (Context.Stats)
     Context.Stats->getFrontendCounters().NumDeclsValidated++;

trunk/lib/Sema/TypeCheckPattern.cpp

@@ -1006,9 +1006,9 @@ bool TypeChecker::coercePatternToType(Pattern *&P, TypeResolution resolution,
     P->setType(type);
     var->setNamingPattern(NP);
 
-    // FIXME: Should probably just remove the forbidden prefix stuff, it no
-    // longer makes a lot of sense in a request-based world.
-    checkForForbiddenPrefix(var);
+    // FIXME: This call can be removed once pattern binding validation is
+    // sufficiently requestified.
+    TypeChecker::checkForForbiddenPrefix(Context, var->getBaseName());
 
     // If we are inferring a variable to have type AnyObject.Type,
     // "()", an uninhabited type, or optional thereof, emit a diagnostic.

trunk/lib/Sema/TypeChecker.cpp

@@ -729,38 +729,18 @@ TypeChecker &swift::createTypeChecker(ASTContext &Ctx) {
   return TypeChecker::createForContext(Ctx);
 }
 
-// checkForForbiddenPrefix is for testing purposes.
-
-void TypeChecker::checkForForbiddenPrefix(const Decl *D) {
-  if (!hasEnabledForbiddenTypecheckPrefix())
+void TypeChecker::checkForForbiddenPrefix(ASTContext &C, DeclBaseName Name) {
+  if (C.LangOpts.DebugForbidTypecheckPrefix.empty())
     return;
-  if (auto VD = dyn_cast<ValueDecl>(D)) {
-    if (!VD->getBaseName().isSpecial())
-      checkForForbiddenPrefix(VD->getBaseName().getIdentifier().str());
-  }
-}
 
-void TypeChecker::checkForForbiddenPrefix(const UnresolvedDeclRefExpr *E) {
-  if (!hasEnabledForbiddenTypecheckPrefix())
+  // Don't touch special names or empty names.
+  if (Name.isSpecial() || Name.empty())
     return;
-  if (!E->getName().isSpecial())
-    checkForForbiddenPrefix(E->getName().getBaseIdentifier());
-}
 
-void TypeChecker::checkForForbiddenPrefix(Identifier Ident) {
-  if (!hasEnabledForbiddenTypecheckPrefix())
-    return;
-  checkForForbiddenPrefix(Ident.empty() ? StringRef() : Ident.str());
-}
-
-void TypeChecker::checkForForbiddenPrefix(StringRef Name) {
-  if (!hasEnabledForbiddenTypecheckPrefix())
-    return;
-  if (Name.empty())
-    return;
-  if (Name.startswith(Context.LangOpts.DebugForbidTypecheckPrefix)) {
+  StringRef Str = Name.getIdentifier().str();
+  if (Str.startswith(C.LangOpts.DebugForbidTypecheckPrefix)) {
     std::string Msg = "forbidden typecheck occurred: ";
-    Msg += Name;
+    Msg += Str;
     llvm::report_fatal_error(Msg);
   }
 }

trunk/lib/Sema/TypeChecker.h

@@ -1883,16 +1883,9 @@ class TypeChecker final : public LazyResolver {
   /// @}
 
   /// If LangOptions::DebugForbidTypecheckPrefix is set and the given decl
-  /// has a name with that prefix, an llvm fatal_error is triggered.
+  /// name starts with that prefix, an llvm fatal_error is triggered.
   /// This is for testing purposes.
-  void checkForForbiddenPrefix(const Decl *D);
-  void checkForForbiddenPrefix(const UnresolvedDeclRefExpr *E);
-  void checkForForbiddenPrefix(Identifier Ident);
-  void checkForForbiddenPrefix(StringRef Name);
-
-  bool hasEnabledForbiddenTypecheckPrefix() const {
-    return !Context.LangOpts.DebugForbidTypecheckPrefix.empty();
-  }
+  static void checkForForbiddenPrefix(ASTContext &C, DeclBaseName Name);
 
   /// Check error handling in the given type-checked top-level code.
   void checkTopLevelErrorHandling(TopLevelCodeDecl *D);

trunk/test/NameBinding/name_lookup.swift

@@ -614,7 +614,6 @@ _ = ShadowingGenericParameter<String>().foo(t: "hi")
 // rdar://problem/51266778
 struct PatternBindingWithTwoVars1 { var x = 3, y = x }
 // expected-error@-1 {{cannot use instance member 'x' within property initializer; property initializers run before 'self' is available}}
-// expected-error@-2 {{property 'x' references itself}}
 
 struct PatternBindingWithTwoVars2 { var x = y, y = 3 }
 // expected-error@-1 {{property 'y' references itself}}

trunk/test/Profiler/coverage_var_init.swift

@@ -1,10 +1,6 @@
 // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_var_init %s | %FileCheck %s
 
 final class VarInit {
-  // CHECK: sil_coverage_map {{.*}} "$s17coverage_var_init7VarInitC018initializedWrapperE0SivpfP"
-  // CHECK-NEXT: [[@LINE+1]]:4 -> [[@LINE+1]]:38 : 0
-  @Wrapper var initializedWrapperInit = 2
-
   // CHECK: sil_coverage_map {{.*}} "$s17coverage_var_init7VarInitC04lazydE033_49373CB2DFB47C8DC62FA963604688DFLLSSvgSSyXEfU_"
   // CHECK-NEXT: [[@LINE+1]]:42 -> [[@LINE+3]]:4 : 0
   private lazy var lazyVarInit: String = {
@@ -27,13 +23,7 @@ final class VarInit {
     print(lazyVarInit)
     print(basicVarInit)
     print(simpleVar)
-    print(initializedWrapperInit)
   }
 }
 
-@propertyWrapper struct Wrapper {
-  init(wrappedValue: Int) {}
-  var wrappedValue: Int { 1 }
-}
-
 VarInit().coverageFunction()

trunk/utils/build-script-impl

@@ -3054,7 +3054,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 results_dir="${lldb_build_dir}/test-results"
 
                 call mkdir -p "${results_dir}"
-                LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --xunit-xml-output=${results_dir}/results.xml"
+                LLVM_LIT_ARG="${LLVM_LIT_ARGS} --xunit-xml-output=${results_dir}/results.xml"
 
                 if [[ "${ENABLE_ASAN}" ]] ; then
                     # Limit the number of parallel tests