---

yaml
---
r: 347127
b: refs/heads/master
c: 64d0e6b
h: refs/heads/master
i:
  347125: a555f1f
  347123: 6ed5082
  347119: 556d8a9

Author: bob-wilson

[refs]

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

trunk/CMakeLists.txt

@@ -235,8 +235,8 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     FALSE)
 
 option(SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-    "Enable the Swift stable ABI's class marker bit for new deployment targets"
-    TRUE)
+    "Enable the Swift stable ABI's class marker bit"
+    FALSE)
 
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")

trunk/include/swift/ABI/Metadata.h

@@ -1192,31 +1192,6 @@ struct TargetClassMetadata : public TargetAnyClassMetadata<Runtime> {
     return bounds;
   }
 
-  /// Given a statically-emitted metadata template, this sets the correct
-  /// "is Swift" bit for the current runtime. Depending on the deployment
-  /// target a binary was compiled for, statically emitted metadata templates
-  /// may have a different bit set from the one that this runtime canonically
-  /// considers the "is Swift" bit.
-  void setAsTypeMetadata() {
-    // If the wrong "is Swift" bit is set, set the correct one.
-    //
-    // Note that the only time we should see the "new" bit set while
-    // expecting the "old" one is when running a binary built for a
-    // new OS on an old OS, which is not supported, however we do
-    // have tests that exercise this scenario.
-    auto otherSwiftBit = (3ULL - SWIFT_CLASS_IS_SWIFT_MASK);
-    assert(otherSwiftBit == 1ULL || otherSwiftBit == 2ULL);
-
-    if ((this->Data & 3) == otherSwiftBit) {
-      this->Data ^= 3;
-    }
-
-    // Otherwise there should be nothing to do, since only the old "is
-    // Swift" bit is used for backward-deployed runtimes.
-    
-    assert(isTypeMetadata());
-  }
-
   static bool classof(const TargetMetadata<Runtime> *metadata) {
     return metadata->getKind() == MetadataKind::Class;
   }

trunk/include/swift/Runtime/BackDeployment.h

@@ -5,7 +5,5 @@
 #define SWIFT_RUNTIME_CMAKECONFIG_H
 
 #cmakedefine01 SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-#cmakedefine01 SWIFT_BNI_OS_BUILD
-#cmakedefine01 SWIFT_BNI_XCODE_BUILD
 
 #endif

trunk/include/swift/Runtime/CMakeConfig.h.in

@@ -1,13 +1,2 @@
-# Detect B&I builds.
-set(SWIFT_BNI_OS_BUILD FALSE)
-set(SWIFT_BNI_XCODE_BUILD FALSE)
-if(DEFINED ENV{RC_XBS})
-  if(NOT DEFINED ENV{RC_XCODE} OR NOT "$ENV{RC_XCODE}")
-    set(SWIFT_BNI_OS_BUILD TRUE)
-  else()
-    set(SWIFT_BNI_XCODE_BUILD TRUE)
-  endif()
-endif()
-
 configure_file(CMakeConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeConfig.h
                ESCAPE_QUOTES @ONLY)

trunk/include/swift/Runtime/CMakeLists.txt

@@ -141,27 +141,10 @@
 /// Which bits in the class metadata are used to distinguish Swift classes
 /// from ObjC classes?
 #ifndef SWIFT_CLASS_IS_SWIFT_MASK
-
-// Non-Apple platforms always use 1.
-# if !defined(__APPLE__)
-#  define SWIFT_CLASS_IS_SWIFT_MASK 1ULL
-
-// Builds for Swift-in-the-OS always use 2.
-# elif SWIFT_BNI_OS_BUILD
+# if defined(__APPLE__) && SWIFT_OBJC_INTEROP && SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
 #  define SWIFT_CLASS_IS_SWIFT_MASK 2ULL
-
-// Builds for Xcode always use 1.
-# elif SWIFT_BNI_XCODE_BUILD
-#  define SWIFT_CLASS_IS_SWIFT_MASK 1ULL
-
-// Other builds (such as local builds on developers' computers)
-// dynamically choose the bit at runtime based on the current OS
-// version.
 # else
-#  define SWIFT_CLASS_IS_SWIFT_MASK _swift_classIsSwiftMask
-#  define SWIFT_CLASS_IS_SWIFT_MASK_GLOBAL_VARIABLE 1
-#  include "BackDeployment.h"
-
+#  define SWIFT_CLASS_IS_SWIFT_MASK 1ULL
 # endif
 #endif
 

trunk/include/swift/Runtime/Config.h

@@ -37,8 +37,6 @@
 extern "C" {
 #endif
 
-extern unsigned long long swift_reflection_classIsSwiftMask;
-
 /// Get the metadata version supported by the Remote Mirror library.
 SWIFT_REMOTE_MIRROR_LINKAGE
 uint16_t swift_reflection_getSupportedMetadataVersion(void);

trunk/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -1011,8 +1011,7 @@ ClangImporter::create(ASTContext &ctx,
   clangDiags.setSeverity(clang::diag::err_module_not_built,
                          clang::diag::Severity::Error,
                          clang::SourceLocation());
-  clangDiags.setSuppressAfterFatalError(
-      !ctx.Diags.getShowDiagnosticsAfterFatalError());
+  clangDiags.setFatalsAsError(ctx.Diags.getShowDiagnosticsAfterFatalError());
 
 
   // Create the associated action.

trunk/lib/ClangImporter/ClangImporter.cpp

@@ -429,11 +429,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableSILOpaqueValues |= Args.hasArg(OPT_enable_sil_opaque_values);
 
 #if SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-  Opts.UseDarwinPreStableABIBit =
-    (Target.isMacOSX() && Target.isMacOSXVersionLT(10, 14, 4)) ||
-    (Target.isiOS() && Target.isOSVersionLT(12, 2)) ||
-    (Target.isTvOS() && Target.isOSVersionLT(12, 2)) ||
-    (Target.isWatchOS() && Target.isOSVersionLT(5, 2));
+  Opts.UseDarwinPreStableABIBit = false;
 #else
   Opts.UseDarwinPreStableABIBit = true;
 #endif

trunk/lib/Frontend/CompilerInvocation.cpp

@@ -2325,18 +2325,16 @@ void PatternMatchEmission::initSharedCaseBlockDest(CaseStmt *caseBlock,
   }
 
   auto pattern = caseBlock->getCaseLabelItems()[0].getPattern();
-  SmallVector<VarDecl *, 4> patternVarDecls;
-  pattern->collectVariables(patternVarDecls);
-  for (auto *vd : patternVarDecls) {
-    if (!vd->hasName())
-      continue;
+  pattern->forEachVariable([&](VarDecl *V) {
+    if (!V->hasName())
+      return;
 
     // We don't pass address-only values in basic block arguments.
-    SILType ty = SGF.getLoweredType(vd->getType());
+    SILType ty = SGF.getLoweredType(V->getType());
     if (ty.isAddressOnly(SGF.F.getModule()))
-      continue;
-    block->createPhiArgument(ty, ValueOwnershipKind::Owned, vd);
-  }
+      return;
+    block->createPhiArgument(ty, ValueOwnershipKind::Owned, V);
+  });
 }
 
 /// Retrieve the jump destination for a shared case block.
@@ -2364,11 +2362,9 @@ void PatternMatchEmission::emitAddressOnlyAllocations() {
     // to point to the incoming args and setup initialization so any args needing
     // cleanup will get that as well.
     auto pattern = caseBlock->getCaseLabelItems()[0].getPattern();
-    SmallVector<VarDecl *, 4> patternVarDecls;
-    pattern->collectVariables(patternVarDecls);
-    for (auto *vd : patternVarDecls) {
+    pattern->forEachVariable([&](VarDecl *vd) {
       if (!vd->hasName())
-        continue;
+        return;
 
       SILType ty = SGF.getLoweredType(vd->getType());
       if (ty.isNull()) {
@@ -2387,11 +2383,12 @@ void PatternMatchEmission::emitAddressOnlyAllocations() {
         }
       }
 
-      if (!ty.isAddressOnly(SGF.F.getModule()))
-        continue;
-      assert(!Temporaries[vd]);
-      Temporaries[vd] = SGF.emitTemporaryAllocation(vd, ty);
-    }
+      if (ty.isAddressOnly(SGF.F.getModule())) {
+        assert(!Temporaries[vd]);
+        Temporaries[vd] = SGF.emitTemporaryAllocation(vd, ty);
+        return;
+      }
+    });
   }
 
   // Now we have all of our cleanups entered, so we can record the
@@ -2461,14 +2458,12 @@ void PatternMatchEmission::emitSharedCaseBlocks() {
     // needing cleanup will get that as well.
     Scope scope(SGF.Cleanups, CleanupLocation(caseBlock));
     auto pattern = caseBlock->getCaseLabelItems()[0].getPattern();
-    SmallVector<VarDecl *, 4> patternVarDecls;
-    pattern->collectVariables(patternVarDecls);
     unsigned argIndex = 0;
-    for (auto *vd : patternVarDecls) {
-      if (!vd->hasName())
-        continue;
+    pattern->forEachVariable([&](VarDecl *V) {
+      if (!V->hasName())
+        return;
 
-      SILType ty = SGF.getLoweredType(vd->getType());
+      SILType ty = SGF.getLoweredType(V->getType());
 
       // Initialize mv at +1. We always pass values in at +1 for today into
       // shared blocks.
@@ -2483,7 +2478,7 @@ void PatternMatchEmission::emitSharedCaseBlocks() {
         //
         // There's nothing to do here, since the value should already have
         // been initialized on entry.
-        auto found = Temporaries.find(vd);
+        auto found = Temporaries.find(V);
         assert(found != Temporaries.end());
         mv = SGF.emitManagedRValueWithCleanup(found->second);
       } else {
@@ -2493,20 +2488,20 @@ void PatternMatchEmission::emitSharedCaseBlocks() {
         mv = SGF.emitManagedRValueWithCleanup(arg);
       }
 
-      if (vd->isLet()) {
+      if (V->isLet()) {
         // Just emit a let and leave the cleanup alone.
-        SGF.VarLocs[vd].value = mv.getValue();
-        continue;
+        SGF.VarLocs[V].value = mv.getValue();
+        return;
       }
 
       // Otherwise, the pattern variables were all emitted as lets and one got
       // passed in. Since we have a var, alloc a box for the var and forward in
       // the chosen value.
-      SGF.VarLocs.erase(vd);
-      auto newVar = SGF.emitInitializationForVarDecl(vd, vd->isLet());
-      newVar->copyOrInitValueInto(SGF, vd, mv, /*isInit*/ true);
+      SGF.VarLocs.erase(V);
+      auto newVar = SGF.emitInitializationForVarDecl(V, V->isLet());
+      newVar->copyOrInitValueInto(SGF, V, mv, /*isInit*/ true);
       newVar->finishInitialization(SGF);
-    }
+    });
 
     // Now that we have setup all of the VarLocs correctly, emit the shared case
     // body.

trunk/lib/SILGen/SILGenPattern.cpp

@@ -10,9 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define SWIFT_CLASS_IS_SWIFT_MASK swift_reflection_classIsSwiftMask
-extern "C" unsigned long long swift_reflection_classIsSwiftMask = 2;
-
 #include "swift/Reflection/ReflectionContext.h"
 #include "swift/Reflection/TypeLowering.h"
 #include "swift/Remote/CMemoryReader.h"

trunk/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -31,7 +31,6 @@ set(swift_runtime_objc_sources
 set(swift_runtime_sources
     AnyHashableSupport.cpp
     Array.cpp
-    BackDeployment.cpp
     Casting.cpp
     CompatibilityOverride.cpp
     CygwinPort.cpp

trunk/stdlib/public/runtime/BackDeployment.cpp

@@ -96,15 +96,7 @@ Metadata *TargetSingletonMetadataInitialization<InProcess>::allocate(
   // If this is a class, we have to initialize the value witness table early
   // so that two-phase initialization can proceed as if this metadata is
   // complete for layout purposes when it appears as part of an aggregate type.
-  //
-  // Note that we can't use (dyn_)cast<ClassMetadata> here because the static
-  // template may have the "wrong" isSwift bit set in its Data pointer, if the
-  // binary was built to deploy back to pre-stable-Swift Objective-C runtimes.
-  // Such a template will fail the `isTypeMetadata` test and we'll think that it
-  // isn't Swift metadata but a plain old ObjC class instead.
-  if (metadata->getKind() == MetadataKind::Class) {
-    auto *classMetadata = static_cast<ClassMetadata*>(metadata);
-    classMetadata->setAsTypeMetadata();
+  if (auto *classMetadata = dyn_cast<ClassMetadata>(metadata)) {
     auto *fullMetadata = asFullMetadata(metadata);
 
     // Begin by initializing the value witness table; everything else is