---

yaml
---
r: 274399
b: refs/heads/master-next
c: 22e2d1d
h: refs/heads/master
i:
  274397: fea8abd
  274395: 0719e10
  274391: 3d84ed0
  274383: 125ea2f
  274367: 82f0db9

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: cbef630f19f869ab5279731179bd731f12b3b9d5
-refs/heads/master-next: e8219a5d04f660131f3e03866be5407c8537d1ee
+refs/heads/master-next: 22e2d1dee048cd145129cfeeb7b4ea33dd7dc952
 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/include/swift/LLVMPasses/Passes.h

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

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

@@ -30,7 +30,7 @@ macro(find_first_existing_vc_file out_var path)
     )
 endmacro()
 
-set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
+set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.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}" "${get_svn_script}"
+      DEPENDS "${dep_file}" "${generate_vcs_version_script}"
       COMMAND
-      ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
-                       "-DFIRST_NAME=${upper_name}"
+      ${CMAKE_COMMAND} "-DNAMES=${upper_name}"
+                       "-D${upper_name}_SOURCE_DIR=${dir}"
                        "-DHEADER_FILE=${revision_inc}"
-                       -P "${get_svn_script}")
+                       -P "${generate_vcs_version_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/Platform.cpp

@@ -142,6 +142,7 @@ 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/ClangImporter/ImportDecl.cpp

@@ -8055,6 +8055,7 @@ 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/IRGen/GenCall.cpp

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

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

@@ -41,7 +41,6 @@
 #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"
@@ -4082,7 +4081,10 @@ IRGenModule::getOrCreateHelperFunction(StringRef fnName, llvm::Type *resultTy,
   llvm::FunctionType *fnTy =
     llvm::FunctionType::get(resultTy, paramTys, false);
 
-  llvm::Constant *fn = Module.getOrInsertFunction(fnName, fnTy);
+  llvm::Constant *fn =
+      cast<llvm::Function>(Module.getOrInsertFunction(fnName, fnTy)
+                               .getCallee()
+                               ->stripPointerCasts());
 
   if (llvm::Function *def = shouldDefineHelper(*this, fn, setIsNoInline)) {
     IRGenFunction IGF(*this, def);

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

@@ -842,8 +842,11 @@ class OpaqueExistentialTypeInfo final :
     // Use copy-on-write existentials?
     auto fn = getAssignBoxedOpaqueExistentialBufferFunction(
         IGF.IGM, getLayout(), objPtrTy);
-    auto call =
-        IGF.Builder.CreateCall(fn, {dest.getAddress(), src.getAddress()});
+    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});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -903,7 +906,10 @@ class OpaqueExistentialTypeInfo final :
     // Use copy-on-write existentials?
     auto fn = getDestroyBoxedOpaqueExistentialBufferFunction(
         IGF.IGM, getLayout(), addr.getAddress()->getType());
-    auto call = IGF.Builder.CreateCall(fn, {addr.getAddress()});
+    auto call = IGF.Builder.CreateCall(
+        fn, {IGF.Builder.CreateBitCast(
+                addr.getAddress(),
+                cast<llvm::Function>(fn)->arg_begin()->getType())});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -2045,8 +2051,11 @@ 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, {existentialContainer.getAddress()});
+  auto *call = IGF.Builder.CreateCall(
+      allocateFun,
+      {IGF.Builder.CreateBitCast(
+          existentialContainer.getAddress(),
+          cast<llvm::Function>(allocateFun)->arg_begin()->getType())});
   call->setCallingConv(IGF.IGM.DefaultCC);
   call->setDoesNotThrow();
   auto addressOfValue = IGF.Builder.CreateBitCast(call, valuePointerType);

branches/master-next/lib/IRGen/GenKeyPath.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));
+          IGM.Module.getOrInsertFunction(fnName, fnTy).getCallee());
         if (fn->empty()) {
           fn->setLinkage(llvm::Function::PrivateLinkage);
           IRGenFunction subIGF(IGM, fn);

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

@@ -70,6 +70,8 @@
 #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>
@@ -125,12 +127,12 @@ static void addSwiftMergeFunctionsPass(const PassManagerBuilder &Builder,
 static void addAddressSanitizerPasses(const PassManagerBuilder &Builder,
                                       legacy::PassManagerBase &PM) {
   PM.add(createAddressSanitizerFunctionPass());
-  PM.add(createAddressSanitizerModulePass());
+  PM.add(createModuleAddressSanitizerLegacyPassPass());
 }
 
 static void addThreadSanitizerPass(const PassManagerBuilder &Builder,
                                    legacy::PassManagerBase &PM) {
-  PM.add(createThreadSanitizerPass());
+  PM.add(createThreadSanitizerLegacyPassPass());
 }
 
 static void addSanitizerCoveragePass(const PassManagerBuilder &Builder,

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

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

branches/master-next/lib/LLVMPasses/ARCEntryPointBuilder.h

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

branches/master-next/lib/LLVMPasses/LLVMSwiftAA.cpp

@@ -32,17 +32,16 @@ static ModRefInfo getConservativeModRefForKind(const llvm::Instruction &I) {
   llvm_unreachable("Not a valid Instruction.");
 }
 
-ModRefInfo SwiftAAResult::getModRefInfo(llvm::ImmutableCallSite CS,
+ModRefInfo SwiftAAResult::getModRefInfo(const llvm::CallBase *Call,
                                         const llvm::MemoryLocation &Loc) {
   // We know at compile time that certain entry points do not modify any
   // compiler-visible state ever. Quickly check if we have one of those
   // instructions and return if so.
-  if (ModRefInfo::NoModRef ==
-      getConservativeModRefForKind(*CS.getInstruction()))
+  if (ModRefInfo::NoModRef == getConservativeModRefForKind(*Call))
     return ModRefInfo::NoModRef;
 
   // Otherwise, delegate to the rest of the AA ModRefInfo machinery.
-  return AAResultBase::getModRefInfo(CS, Loc);
+  return AAResultBase::getModRefInfo(Call, Loc);
 }
 
 //===----------------------------------------------------------------------===//