---

yaml
---
r: 275327
b: refs/heads/master-next
c: b993c6e
h: refs/heads/master
i:
  275325: 157ef7e
  275323: adaaf9f
  275319: 425f2d1
  275311: 71658f3
  275295: 6571057
  275263: 55c766b
  275199: 8aa8ecf

Author: DougGregor

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 65b3164726f2e62dff31e90a5cb5e3fb67cc82bf
-refs/heads/master-next: e584416210827d9b72c670703a8cfdab6a91c51f
+refs/heads/master-next: b993c6e07692d9f63533bda2da32f7080b426224
 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/docs/SIL.rst

@@ -4311,7 +4311,7 @@ open_existential_addr
   //   type P
   // $*@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $*@opened P
+  // %1 will be of type $*P
 
 Obtains the address of the concrete value inside the existential
 container referenced by ``%0``. The protocol conformances associated
@@ -4334,7 +4334,7 @@ open_existential_value
   //   type P
   // $@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $@opened P
+  // %1 will be of type $P
 
 Loadable version of the above: Opens-up the existential
 container associated with ``%0``. The protocol conformances associated

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/SIL/SILBuilder.h

@@ -198,9 +198,7 @@ class SILBuilder {
   SILModule &getModule() const { return C.Module; }
   ASTContext &getASTContext() const { return getModule().getASTContext(); }
   const Lowering::TypeLowering &getTypeLowering(SILType T) const {
-    // FIXME: Expansion
-    return getModule().Types.getTypeLowering(T,
-                                             ResilienceExpansion::Minimal);
+    return getModule().getTypeLowering(T);
   }
 
   void setOpenedArchetypesTracker(SILOpenedArchetypesTracker *Tracker) {
@@ -2157,15 +2155,13 @@ class SILBuilder {
     if (!SILModuleConventions(M).useLoweredAddresses())
       return true;
 
-    // FIXME: Just call getTypeLowering() here, and move this code there
-
     auto expansion = ResilienceExpansion::Maximal;
     // If there's no current SILFunction, we're inserting into a global
     // variable initializer.
     if (F)
       expansion = F->getResilienceExpansion();
 
-    return M.Types.getTypeLowering(Ty, expansion).isLoadable();
+    return M.getTypeLowering(Ty, expansion).isLoadable();
   }
 
   void appendOperandTypeName(SILType OpdTy, llvm::SmallString<16> &Name) {

branches/master-next/include/swift/SIL/SILModule.h

@@ -315,6 +315,13 @@ class SILModule {
   /// This converts Swift types to SILTypes.
   mutable Lowering::TypeConverter Types;
 
+  /// Look up the TypeLowering for a SILType.
+  const Lowering::TypeLowering &
+  getTypeLowering(SILType t, ResilienceExpansion expansion =
+                               ResilienceExpansion::Minimal) {
+    return Types.getTypeLowering(t, expansion);
+  }
+
   /// Invalidate cached entries in SIL Loader.
   void invalidateSILLoaderCaches();
 

branches/master-next/include/swift/SIL/TypeLowering.h

@@ -216,29 +216,26 @@ class TypeLowering {
   };
 
 private:
-  friend class TypeConverter;
-
   /// The SIL type of values with this Swift type.
   SILType LoweredType;
 
   RecursiveProperties Properties;
   unsigned ReferenceCounted : 1;
 
+public:
   /// The resilience expansion for this type lowering.
   /// If the type is not resilient at all, this is always Minimal.
-  unsigned ForExpansion : 1;
+  ResilienceExpansion forExpansion = ResilienceExpansion::Minimal;
 
   /// A single linked list of lowerings for different resilience expansions.
   /// The first lowering is always for ResilientExpansion::Minimal.
-  mutable const TypeLowering *NextExpansion = nullptr;
+  mutable const TypeLowering *nextExpansion = nullptr;
 
 protected:
   TypeLowering(SILType type, RecursiveProperties properties,
-               IsReferenceCounted_t isRefCounted,
-               ResilienceExpansion forExpansion)
+               IsReferenceCounted_t isRefCounted)
     : LoweredType(type), Properties(properties),
-      ReferenceCounted(isRefCounted),
-      ForExpansion(unsigned(forExpansion)) {}
+      ReferenceCounted(isRefCounted) {}
 
 public:
   TypeLowering(const TypeLowering &) = delete;
@@ -250,22 +247,12 @@ class TypeLowering {
   /// convention?
   ///
   /// This is independent of whether the SIL argument is address type.
-  bool isFormallyPassedIndirectly() const {
-    assert(!isResilient() ||
-           getResilienceExpansion() == ResilienceExpansion::Minimal &&
-           "calling convention uses minimal resilience expansion");
-    return isAddressOnly();
-  }
+  bool isFormallyPassedIndirectly() const { return isAddressOnly(); }
 
   /// Are r-values of this type returned indirectly by formal convention?
   ///
   /// This is independent of whether the SIL result is address type.
-  bool isFormallyReturnedIndirectly() const {
-    assert(!isResilient() ||
-           getResilienceExpansion() == ResilienceExpansion::Minimal &&
-           "calling convention uses minimal resilience expansion");
-    return isAddressOnly();
-  }
+  bool isFormallyReturnedIndirectly() const { return isAddressOnly(); }
 
   RecursiveProperties getRecursiveProperties() const {
     return Properties;
@@ -319,10 +306,6 @@ class TypeLowering {
     return Properties.isResilient();
   }
 
-  ResilienceExpansion getResilienceExpansion() const {
-    return ResilienceExpansion(ForExpansion);
-  }
-
   /// Produce an exact copy of the value in the given address as a
   /// scalar.  The caller is responsible for destroying this value,
   /// e.g. by releasing it.
@@ -765,7 +748,8 @@ class TypeConverter {
   /// Lowers a Swift type to a SILType, and returns the SIL TypeLowering
   /// for that type.
   const TypeLowering &
-  getTypeLowering(Type t, ResilienceExpansion forExpansion) {
+  getTypeLowering(Type t, ResilienceExpansion forExpansion =
+                            ResilienceExpansion::Minimal) {
     AbstractionPattern pattern(getCurGenericContext(), t->getCanonicalType());
     return getTypeLowering(pattern, t, forExpansion);
   }
@@ -774,28 +758,33 @@ class TypeConverter {
   /// patterns of the given original type.
   const TypeLowering &getTypeLowering(AbstractionPattern origType,
                                       Type substType,
-                                      ResilienceExpansion forExpansion);
+                                      ResilienceExpansion forExpansion =
+                                        ResilienceExpansion::Minimal);
 
   /// Returns the SIL TypeLowering for an already lowered SILType. If the
   /// SILType is an address, returns the TypeLowering for the pointed-to
   /// type.
   const TypeLowering &
-  getTypeLowering(SILType t, ResilienceExpansion forExpansion);
+  getTypeLowering(SILType t, ResilienceExpansion forExpansion =
+                               ResilienceExpansion::Minimal);
 
   // Returns the lowered SIL type for a Swift type.
-  SILType getLoweredType(Type t, ResilienceExpansion forExpansion) {
+  SILType getLoweredType(Type t, ResilienceExpansion forExpansion
+                           = ResilienceExpansion::Minimal) {
     return getTypeLowering(t, forExpansion).getLoweredType();
   }
 
   // Returns the lowered SIL type for a Swift type.
   SILType getLoweredType(AbstractionPattern origType, Type substType,
-                         ResilienceExpansion forExpansion) {
+                         ResilienceExpansion forExpansion =
+                           ResilienceExpansion::Minimal) {
     return getTypeLowering(origType, substType, forExpansion)
       .getLoweredType();
   }
 
   SILType getLoweredLoadableType(Type t,
-                                 ResilienceExpansion forExpansion) {
+                                 ResilienceExpansion forExpansion =
+                                   ResilienceExpansion::Minimal) {
     const TypeLowering &ti = getTypeLowering(t, forExpansion);
     assert(
         (ti.isLoadable() || !SILModuleConventions(M).useLoweredAddresses()) &&
@@ -804,16 +793,11 @@ class TypeConverter {
   }
 
   CanType getLoweredRValueType(Type t) {
-    // We're ignoring the category (object vs address), so the resilience
-    // expansion does not matter.
-    return getLoweredType(t, ResilienceExpansion::Minimal).getASTType();
+    return getLoweredType(t).getASTType();
   }
 
   CanType getLoweredRValueType(AbstractionPattern origType, Type substType) {
-    // We're ignoring the category (object vs address), so the resilience
-    // expansion does not matter.
-    return getLoweredType(origType, substType,
-                          ResilienceExpansion::Minimal).getASTType();
+    return getLoweredType(origType, substType).getASTType();
   }
 
   AbstractionPattern getAbstractionPattern(AbstractStorageDecl *storage,

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

@@ -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/Platform.cpp

@@ -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/ClangImporter/ImportDecl.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/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -401,7 +401,7 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
   ID emitModuleOption;
   std::string moduleExtension;
   std::string mainOutputIfUsableForModule;
-  deriveModulePathParameters(outputFile, emitModuleOption, moduleExtension,
+  deriveModulePathParameters(emitModuleOption, moduleExtension,
                              mainOutputIfUsableForModule);
 
   auto moduleOutputPath = determineSupplementaryOutputFilename(
@@ -458,7 +458,7 @@ SupplementaryOutputPathsComputer::determineSupplementaryOutputFilename(
 };
 
 void SupplementaryOutputPathsComputer::deriveModulePathParameters(
-    StringRef mainOutputFile, options::ID &emitOption, std::string &extension,
+    options::ID &emitOption, std::string &extension,
     std::string &mainOutputIfUsable) const {
 
   bool isSIB = RequestedAction == FrontendOptions::ActionType::EmitSIB ||
@@ -477,7 +477,7 @@ void SupplementaryOutputPathsComputer::deriveModulePathParameters(
       isSIB ? file_types::TY_SIB : file_types::TY_SwiftModuleFile);
 
   mainOutputIfUsable =
-      canUseMainOutputForModule && !OutputFiles.empty() ? mainOutputFile : "";
+      canUseMainOutputForModule && !OutputFiles.empty() ? OutputFiles[0] : "";
 }
 
 static SupplementaryOutputPaths

branches/master-next/lib/Frontend/ArgsToFrontendOutputsConverter.h

@@ -167,8 +167,7 @@ class SupplementaryOutputPathsComputer {
       file_types::ID type, StringRef mainOutputIfUsable,
       StringRef defaultSupplementaryOutputPathExcludingExtension) const;
 
-  void deriveModulePathParameters(StringRef mainOutputFile,
-                                  options::ID &emitOption,
+  void deriveModulePathParameters(options::ID &emitOption,
                                   std::string &extension,
                                   std::string &mainOutputIfUsable) const;
 };