---

yaml
---
r: 275455
b: refs/heads/master-next
c: 52b833d
h: refs/heads/master
i:
  275453: b24a97c
  275451: 08468a6
  275447: 10f10ec
  275439: 2f97917
  275423: 34a38b5
  275391: eef4d91
  275327: f04b868
  275199: 8aa8ecf
  274943: 588dd85
  274431: dece103

Author: Suyash Srijan

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 65b3164726f2e62dff31e90a5cb5e3fb67cc82bf
-refs/heads/master-next: 43fd0c50a53ce6a59923c6ee691743407ae5bea7
+refs/heads/master-next: 52b833d54313247a3f4da49003964adaec7dc7de
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/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'")

branches/master-next/cmake/modules/AddSwift.cmake

@@ -1209,15 +1209,6 @@ function(_add_swift_library_single target name)
     "${SWIFTLIB_SINGLE_FORCE_BUILD_OPTIMIZED_keyword}"
     RESULT_VAR_NAME c_compile_flags
     )
-
-  if(SWIFTLIB_IS_STDLIB)
-    # We don't ever want to link against the ABI-breakage checking symbols
-    # in the standard library, runtime, or overlays because they only rely
-    # on the header parts of LLVM's ADT.
-    list(APPEND c_compile_flags
-      "-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1")
-  endif()
-
   if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)
     if(libkind STREQUAL SHARED)
       list(APPEND c_compile_flags -D_WINDLL)

branches/master-next/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;
   }

branches/master-next/include/swift/LLVMPasses/Passes.h

@@ -30,7 +30,7 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
+    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
                                    const llvm::MemoryLocation &Loc);
   };
 

branches/master-next/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

branches/master-next/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)

branches/master-next/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
 

branches/master-next/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);

branches/master-next/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -30,7 +30,7 @@ macro(find_first_existing_vc_file out_var path)
     )
 endmacro()
 
-set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.cmake")
+set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
 
 function(generate_revision_inc revision_inc_var name dir)
   find_first_existing_vc_file(dep_file "${dir}")
@@ -39,12 +39,12 @@ function(generate_revision_inc revision_inc_var name dir)
   string(TOUPPER ${name} upper_name)
   if(DEFINED dep_file)
     add_custom_command(OUTPUT "${revision_inc}"
-      DEPENDS "${dep_file}" "${generate_vcs_version_script}"
+      DEPENDS "${dep_file}" "${get_svn_script}"
       COMMAND
-      ${CMAKE_COMMAND} "-DNAMES=${upper_name}"
-                       "-D${upper_name}_SOURCE_DIR=${dir}"
+      ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
+                       "-DFIRST_NAME=${upper_name}"
                        "-DHEADER_FILE=${revision_inc}"
-                       -P "${generate_vcs_version_script}")
+                       -P "${get_svn_script}")
   else()
     # Generate an empty Revision.inc file if we are not using git or SVN.
     file(WRITE "${revision_inc}" "")

branches/master-next/lib/Basic/CMakeLists.txt

@@ -142,7 +142,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::AMDPAL:
   case llvm::Triple::HermitCore:
   case llvm::Triple::Hurd:
-  case llvm::Triple::WASI:
     return "";
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX:

branches/master-next/lib/Basic/Platform.cpp

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

branches/master-next/lib/ClangImporter/ClangImporter.cpp

@@ -8053,7 +8053,6 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
   case clang::APValue::Array:
   case clang::APValue::ComplexFloat:
   case clang::APValue::ComplexInt:
-  case clang::APValue::FixedPoint:
   case clang::APValue::LValue:
   case clang::APValue::MemberPointer:
   case clang::APValue::Struct:

branches/master-next/lib/ClangImporter/ImportDecl.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

branches/master-next/lib/Frontend/CompilerInvocation.cpp

@@ -1609,7 +1609,7 @@ llvm::CallSite CallEmission::emitCallSite() {
                                       { opaqueCallee });
     opaqueCallee =
       IGF.Builder.CreateBitCast(opaqueCallee, origCallee->getType());
-    call->setCalledFunction(fn.getFunctionType(), opaqueCallee);
+    call->setCalledFunction(opaqueCallee);
 
     // Reset the insert point to after the call.
     IGF.Builder.SetInsertPoint(call->getParent());

branches/master-next/lib/IRGen/GenCall.cpp

@@ -41,6 +41,7 @@
 #include "llvm/IR/GlobalAlias.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/TypeBuilder.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/ConvertUTF.h"
@@ -4081,10 +4082,7 @@ IRGenModule::getOrCreateHelperFunction(StringRef fnName, llvm::Type *resultTy,
   llvm::FunctionType *fnTy =
     llvm::FunctionType::get(resultTy, paramTys, false);
 
-  llvm::Constant *fn =
-      cast<llvm::Function>(Module.getOrInsertFunction(fnName, fnTy)
-                               .getCallee()
-                               ->stripPointerCasts());
+  llvm::Constant *fn = Module.getOrInsertFunction(fnName, fnTy);
 
   if (llvm::Function *def = shouldDefineHelper(*this, fn, setIsNoInline)) {
     IRGenFunction IGF(*this, def);

branches/master-next/lib/IRGen/GenDecl.cpp

@@ -842,11 +842,8 @@ class OpaqueExistentialTypeInfo final :
     // Use copy-on-write existentials?
     auto fn = getAssignBoxedOpaqueExistentialBufferFunction(
         IGF.IGM, getLayout(), objPtrTy);
-    auto destAddress = IGF.Builder.CreateBitCast(
-        dest.getAddress(), cast<llvm::Function>(fn)->arg_begin()[0].getType());
-    auto srcAddress = IGF.Builder.CreateBitCast(
-        src.getAddress(), cast<llvm::Function>(fn)->arg_begin()[1].getType());
-    auto call = IGF.Builder.CreateCall(fn, {destAddress, srcAddress});
+    auto call =
+        IGF.Builder.CreateCall(fn, {dest.getAddress(), src.getAddress()});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -906,10 +903,7 @@ class OpaqueExistentialTypeInfo final :
     // Use copy-on-write existentials?
     auto fn = getDestroyBoxedOpaqueExistentialBufferFunction(
         IGF.IGM, getLayout(), addr.getAddress()->getType());
-    auto call = IGF.Builder.CreateCall(
-        fn, {IGF.Builder.CreateBitCast(
-                addr.getAddress(),
-                cast<llvm::Function>(fn)->arg_begin()->getType())});
+    auto call = IGF.Builder.CreateCall(fn, {addr.getAddress()});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -2051,11 +2045,8 @@ Address irgen::emitAllocateBoxedOpaqueExistentialBuffer(
   /// Call a function to handle the non-fixed case.
   auto *allocateFun = getAllocateBoxedOpaqueExistentialBufferFunction(
       IGF.IGM, existLayout, existentialContainer.getAddress()->getType());
-  auto *call = IGF.Builder.CreateCall(
-      allocateFun,
-      {IGF.Builder.CreateBitCast(
-          existentialContainer.getAddress(),
-          cast<llvm::Function>(allocateFun)->arg_begin()->getType())});
+  auto *call =
+      IGF.Builder.CreateCall(allocateFun, {existentialContainer.getAddress()});
   call->setCallingConv(IGF.IGM.DefaultCC);
   call->setDoesNotThrow();
   auto addressOfValue = IGF.Builder.CreateBitCast(call, valuePointerType);

branches/master-next/lib/IRGen/GenExistential.cpp

@@ -989,7 +989,7 @@ emitKeyPathComponent(IRGenModule &IGM,
         fnName.append("keypath_get_selector_");
         fnName.append(selectorName);
         auto fn = cast<llvm::Function>(
-          IGM.Module.getOrInsertFunction(fnName, fnTy).getCallee());
+          IGM.Module.getOrInsertFunction(fnName, fnTy));
         if (fn->empty()) {
           fn->setLinkage(llvm::Function::PrivateLinkage);
           IRGenFunction subIGF(IGM, fn);

branches/master-next/lib/IRGen/GenKeyPath.cpp

@@ -70,8 +70,6 @@
 #include "llvm/Transforms/IPO/AlwaysInliner.h"
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Instrumentation.h"
-#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
-#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
 #include "llvm/Transforms/ObjCARC.h"
 
 #include <thread>
@@ -127,12 +125,12 @@ static void addSwiftMergeFunctionsPass(const PassManagerBuilder &Builder,
 static void addAddressSanitizerPasses(const PassManagerBuilder &Builder,
                                       legacy::PassManagerBase &PM) {
   PM.add(createAddressSanitizerFunctionPass());
-  PM.add(createModuleAddressSanitizerLegacyPassPass());
+  PM.add(createAddressSanitizerModulePass());
 }
 
 static void addThreadSanitizerPass(const PassManagerBuilder &Builder,
                                    legacy::PassManagerBase &PM) {
-  PM.add(createThreadSanitizerLegacyPassPass());
+  PM.add(createThreadSanitizerPass());
 }
 
 static void addSanitizerCoveragePass(const PassManagerBuilder &Builder,

branches/master-next/lib/IRGen/IRGen.cpp

@@ -571,8 +571,7 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
                                       {argTypes.begin(), argTypes.end()},
                                       /*isVararg*/ false);
 
-  cache =
-      cast<llvm::Function>(Module.getOrInsertFunction(name, fnTy).getCallee());
+  cache = Module.getOrInsertFunction(name, fnTy);
 
   // Add any function attributes and set the calling convention.
   if (auto fn = dyn_cast<llvm::Function>(cache)) {
@@ -962,9 +961,8 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
   if (linkLib.shouldForceLoad()) {
     llvm::SmallString<64> buf;
     encodeForceLoadSymbolName(buf, linkLib.getName());
-    auto ForceImportThunk = cast<llvm::Function>(
-        Module.getOrInsertFunction(buf, llvm::FunctionType::get(VoidTy, false))
-            .getCallee());
+    auto ForceImportThunk =
+        Module.getOrInsertFunction(buf, llvm::FunctionType::get(VoidTy, false));
     ApplyIRLinkage(IRLinkage::ExternalImport)
         .to(cast<llvm::GlobalValue>(ForceImportThunk));
 

branches/master-next/lib/IRGen/IRGenModule.cpp

@@ -260,10 +260,9 @@ class ARCEntryPointBuilder {
     auto AttrList = AttributeList::get(M.getContext(), 1, Attribute::NoCapture);
     AttrList = AttrList.addAttribute(
         M.getContext(), AttributeList::FunctionIndex, Attribute::NoUnwind);
-    CheckUnowned = cast<llvm::Function>(
-        M.getOrInsertFunction("swift_checkUnowned", AttrList,
-                              Type::getVoidTy(M.getContext()), ObjectPtrTy)
-            .getCallee());
+    CheckUnowned = M.getOrInsertFunction("swift_checkUnowned", AttrList,
+                                         Type::getVoidTy(M.getContext()),
+                                         ObjectPtrTy);
     if (llvm::Triple(M.getTargetTriple()).isOSBinFormatCOFF() &&
         !llvm::Triple(M.getTargetTriple()).isOSCygMing())
       if (auto *F = llvm::dyn_cast<llvm::Function>(CheckUnowned.get()))