---

yaml
---
r: 343725
b: refs/heads/master-rebranch
c: a9af910
h: refs/heads/master
i:
  343723: d2b5711

Author: rintaro

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 111fb37f743ea8467a9f583636fec5f9520477aa
+refs/heads/master-rebranch: a9af910664e529c521dc4659f26bf8dd81021ffd
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/include/swift/AST/DiagnosticsSema.def

@@ -2680,11 +2680,6 @@ ERROR(rethrows_without_throwing_parameter,none,
 ERROR(autoclosure_function_type,none,
       "@autoclosure attribute only applies to function types",
       ())
-
-ERROR(invalid_autoclosure_and_convention_attributes,none,
-      "'@convention(%0)' attribute is not allowed on '@autoclosure' types",
-      (StringRef))
-
 ERROR(autoclosure_function_input_nonunit,none,
       "argument type of @autoclosure parameter must be '()'", ())
 

branches/master-rebranch/include/swift/Basic/Defer.h

@@ -18,15 +18,25 @@
 #ifndef SWIFT_BASIC_DEFER_H
 #define SWIFT_BASIC_DEFER_H
 
-#include "llvm/ADT/ScopeExit.h"
+#include <type_traits>
 
 namespace swift {
+  template <typename F>
+  class DoAtScopeExit {
+    F Fn;
+    void operator=(DoAtScopeExit&) = delete;
+  public:
+    DoAtScopeExit(F &&Fn) : Fn(std::move(Fn)) {}
+    ~DoAtScopeExit() {
+      Fn();
+    }
+  };
+
   namespace detail {
     struct DeferTask {};
     template<typename F>
-    auto operator+(DeferTask, F &&fn) ->
-        decltype(llvm::make_scope_exit(std::forward<F>(fn))) {
-      return llvm::make_scope_exit(std::forward<F>(fn));
+    DoAtScopeExit<typename std::decay<F>::type> operator+(DeferTask, F&& fn) {
+      return DoAtScopeExit<typename std::decay<F>::type>(std::move(fn));
     }
   }
 } // end namespace swift

branches/master-rebranch/include/swift/Parse/ParsedRawSyntaxNode.h

@@ -141,7 +141,7 @@ class ParsedRawSyntaxNode {
     case DataKind::DeferredLayout:
       return getDeferredLayoutRange();
     case DataKind::DeferredToken:
-      return getDeferredTokenRange();
+      return getDeferredTokenRangeWithoutBackticks();
     default:
       llvm_unreachable("node not deferred");
     }
@@ -194,7 +194,7 @@ class ParsedRawSyntaxNode {
 
     return CharSourceRange{begin, len};
   }
-  CharSourceRange getDeferredTokenRange() const {
+  CharSourceRange getDeferredTokenRangeWithoutBackticks() const {
     assert(DK == DataKind::DeferredToken);
     return CharSourceRange{DeferredToken.TokLoc, DeferredToken.TokLength};
   }

branches/master-rebranch/include/swift/Parse/Parser.h

@@ -695,6 +695,25 @@ class Parser {
   /// plain Tok.is(T1) check).
   bool skipUntilTokenOrEndOfLine(tok T1);
 
+  void ignoreToken();
+  void ignoreToken(tok Kind) {
+    assert(Tok.is(Kind));
+    ignoreToken();
+  }
+  bool ignoreIf(tok Kind) {
+    if (!Tok.is(Kind))
+      return false;
+    ignoreToken();
+    return true;
+  }
+  void ignoreSingle();
+  void ignoreUntil(tok Kind);
+
+  /// Ignore tokens until a token that starts with '>', and return true it if
+  /// found. Applies heuristics that are suitable when trying to find the end
+  /// of a list of generic parameters, generic arguments.
+  bool ignoreUntilGreaterInTypeList();
+
   /// If the parser is generating only a syntax tree, try loading the current
   /// node from a previously generated syntax tree.
   /// Returns \c true if the node has been loaded and inserted into the current

branches/master-rebranch/include/swift/Parse/Token.h

@@ -248,6 +248,17 @@ class Token {
     return CharSourceRange(getLoc(), getLength());
   }
 
+  CharSourceRange getRangeWithoutBackticks() const {
+    SourceLoc TokLoc = getLoc();
+    unsigned TokLength = getLength();
+    if (isEscapedIdentifier()) {
+      // Adjust to account for the backticks.
+      TokLoc = TokLoc.getAdvancedLoc(1);
+      TokLength -= 2;
+    }
+    return CharSourceRange(TokLoc, TokLength);
+  }
+
   bool hasComment() const {
     return CommentLength != 0;
   }

branches/master-rebranch/include/swift/Syntax/TokenSyntax.h

@@ -80,15 +80,6 @@ class TokenSyntax final : public Syntax {
     return getRaw()->getTokenText();
   }
 
-  StringRef getIdentifierText() const {
-    StringRef text = getText();
-    if (text.front() == '`') {
-      assert(text.back() == '`');
-      return text.slice(1, text.size() - 1);
-    }
-    return text;
-  }
-
   static bool kindof(SyntaxKind Kind) {
     return isTokenKind(Kind);
   }

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

@@ -789,10 +789,12 @@ namespace {
 
 
 static llvm::Constant *getAssignBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout);
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy);
 
 static llvm::Constant *getDestroyBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout);
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy);
 
 static llvm::Constant *
 getProjectBoxedOpaqueExistentialFunction(IRGenFunction &IGF,
@@ -841,14 +843,13 @@ class OpaqueExistentialTypeInfo final :
   void assignWithCopy(IRGenFunction &IGF, Address dest, Address src, SILType T,
                       bool isOutlined) const override {
 
+    auto objPtrTy = dest.getAddress()->getType();
+
     // Use copy-on-write existentials?
     auto fn = getAssignBoxedOpaqueExistentialBufferFunction(
-        IGF.IGM, getLayout());
-    auto *type = IGF.IGM.getExistentialPtrTy(getLayout().getNumTables());
-    auto *destAddr = IGF.Builder.CreateBitCast(dest.getAddress(), type);
-    auto *srcAddr = IGF.Builder.CreateBitCast(src.getAddress(), type);
+        IGF.IGM, getLayout(), objPtrTy);
     auto call =
-        IGF.Builder.CreateCall(fn, {destAddr, srcAddr});
+        IGF.Builder.CreateCall(fn, {dest.getAddress(), src.getAddress()});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -903,15 +904,12 @@ class OpaqueExistentialTypeInfo final :
     }
   }
 
-  void destroy(IRGenFunction &IGF, Address buffer, SILType T,
+  void destroy(IRGenFunction &IGF, Address addr, SILType T,
                bool isOutlined) const override {
     // Use copy-on-write existentials?
     auto fn = getDestroyBoxedOpaqueExistentialBufferFunction(
-        IGF.IGM, getLayout());
-    auto *addr = IGF.Builder.CreateBitCast(
-        buffer.getAddress(),
-        IGF.IGM.getExistentialPtrTy(getLayout().getNumTables()));
-    auto call = IGF.Builder.CreateCall(fn, {addr});
+        IGF.IGM, getLayout(), addr.getAddress()->getType());
+    auto call = IGF.Builder.CreateCall(fn, {addr.getAddress()});
     call->setCallingConv(IGF.IGM.DefaultCC);
     call->setDoesNotThrow();
     return;
@@ -1357,36 +1355,6 @@ createErrorExistentialTypeInfo(IRGenModule &IGM,
                                       refcounting);
 }
 
-llvm::Type *TypeConverter::getExistentialType(unsigned numWitnessTables) {
-  llvm::StructType *&type = OpaqueExistentialTypes[numWitnessTables];
-  if (type)
-    return type;
-  
-  SmallVector<llvm::Type*, 5> fields;
-
-  fields.push_back(IGM.getFixedBufferTy());
-  fields.push_back(IGM.TypeMetadataPtrTy);
-
-  for (auto i : range(numWitnessTables)) {
-    fields.push_back(IGM.WitnessTablePtrTy);
-    (void) i;
-  }
-
-  llvm::SmallString<40> typeName;
-  llvm::raw_svector_ostream(typeName)
-      << "__opaque_existential_type_"
-      << numWitnessTables;
-
-  type = llvm::StructType::create(IGM.getLLVMContext(), StringRef(typeName));
-  type->setBody(fields);
-
-  return type;
-}
-
-llvm::PointerType *IRGenModule::getExistentialPtrTy(unsigned numTables) {
-  return Types.getExistentialType(numTables)->getPointerTo();
-}
-
 static const TypeInfo *createExistentialTypeInfo(IRGenModule &IGM, CanType T) {
   auto layout = T.getExistentialLayout();
 
@@ -1799,26 +1767,24 @@ void irgen::emitExistentialMetatypeContainer(IRGenFunction &IGF,
                               });
 }
 
-void irgen::emitMetatypeOfOpaqueExistential(IRGenFunction &IGF, Address buffer,
+void irgen::emitMetatypeOfOpaqueExistential(IRGenFunction &IGF, Address addr,
                                             SILType type, Explosion &out) {
   assert(type.isExistentialType());
   assert(!type.isClassExistentialType());
   auto &baseTI = IGF.getTypeInfo(type).as<OpaqueExistentialTypeInfo>();
 
   // Get the static metadata.
   auto existLayout = baseTI.getLayout();
-  llvm::Value *metadata = existLayout.loadMetadataRef(IGF, buffer);
+  llvm::Value *metadata = existLayout.loadMetadataRef(IGF, addr);
 
   // Project the buffer and apply the 'typeof' value witness.
+  Address buffer = existLayout.projectExistentialBuffer(IGF, addr);
   llvm::Value *object;
 
-  auto *addr = IGF.Builder.CreateBitCast(
-      buffer.getAddress(),
-      IGF.IGM.getExistentialPtrTy(existLayout.getNumTables()));
   auto *projectFunc = getProjectBoxedOpaqueExistentialFunction(
       IGF, OpenedExistentialAccess::Immutable, existLayout);
   auto *addrOfValue =
-      IGF.Builder.CreateCall(projectFunc, {addr, metadata});
+      IGF.Builder.CreateCall(projectFunc, {buffer.getAddress(), metadata});
   addrOfValue->setCallingConv(IGF.IGM.DefaultCC);
   addrOfValue->setDoesNotThrow();
   object = addrOfValue;
@@ -1830,7 +1796,7 @@ void irgen::emitMetatypeOfOpaqueExistential(IRGenFunction &IGF, Address buffer,
   out.add(dynamicType);
 
   // Get the witness tables.
-  baseTI.emitLoadOfTables(IGF, buffer, out);
+  baseTI.emitLoadOfTables(IGF, addr, out);
 }
 
 void irgen::emitMetatypeOfBoxedExistential(IRGenFunction &IGF, Explosion &value,
@@ -2001,9 +1967,10 @@ static Address castToOpaquePtr(IRGenFunction &IGF, Address addr) {
 }
 
 static llvm::Constant *getAllocateBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout) {
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy) {
 
-  llvm::Type *argTys[] = {IGM.getExistentialPtrTy(existLayout.getNumTables())};
+  llvm::Type *argTys[] = {existContainerPointerTy};
 
   // __swift_allocate_boxed_opaque_existential__N is the well-known function for
   // allocating buffers in existential containers of types with N witness
@@ -2084,22 +2051,20 @@ Address irgen::emitAllocateBoxedOpaqueExistentialBuffer(
   }
   /// Call a function to handle the non-fixed case.
   auto *allocateFun = getAllocateBoxedOpaqueExistentialBufferFunction(
-      IGF.IGM, existLayout);
-  auto *existentialAddr = IGF.Builder.CreateBitCast(
-      existentialContainer.getAddress(),
-      IGF.IGM.getExistentialPtrTy(existLayout.getNumTables()));
+      IGF.IGM, existLayout, existentialContainer.getAddress()->getType());
   auto *call =
-      IGF.Builder.CreateCall(allocateFun, {existentialAddr});
+      IGF.Builder.CreateCall(allocateFun, {existentialContainer.getAddress()});
   call->setCallingConv(IGF.IGM.DefaultCC);
   call->setDoesNotThrow();
   auto addressOfValue = IGF.Builder.CreateBitCast(call, valuePointerType);
   return valueTI.getAddressForPointer(addressOfValue);
 }
 
 static llvm::Constant *getDeallocateBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout) {
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy) {
 
-  llvm::Type *argTys[] = {IGM.getExistentialPtrTy(existLayout.getNumTables())};
+  llvm::Type *argTys[] = {existContainerPointerTy};
 
   // __swift_deallocate_boxed_opaque_existential_N is the well-known function
   // for deallocating buffers in existential containers of types with N witness
@@ -2176,11 +2141,9 @@ void irgen::emitDeallocateBoxedOpaqueExistentialBuffer(
   OpaqueExistentialLayout existLayout = existentialTI.getLayout();
 
   auto *deallocateFun = getDeallocateBoxedOpaqueExistentialBufferFunction(
-      IGF.IGM, existLayout);
-  auto *bufferAddr = IGF.Builder.CreateBitCast(
-      existentialContainer.getAddress(),
-      IGF.IGM.getExistentialPtrTy(existLayout.getNumTables()));
-  auto *call = IGF.Builder.CreateCall(deallocateFun, {bufferAddr});
+      IGF.IGM, existLayout, existentialContainer.getAddress()->getType());
+  auto *call = IGF.Builder.CreateCall(deallocateFun,
+                                      {existentialContainer.getAddress()});
   call->setCallingConv(IGF.IGM.DefaultCC);
   call->setDoesNotThrow();
   return;
@@ -2192,7 +2155,7 @@ getProjectBoxedOpaqueExistentialFunction(IRGenFunction &IGF,
                                          OpaqueExistentialLayout existLayout) {
 
   auto &IGM = IGF.IGM;
-  auto *existentialBufferTy = IGM.getExistentialPtrTy(existLayout.getNumTables());
+  auto *existentialBufferTy = IGM.getFixedBufferTy()->getPointerTo();
   llvm::Type *argTys[] = {existentialBufferTy, IGM.TypeMetadataPtrTy};
 
   // __swift_project_boxed_opaque_existential_N is the well-known function for
@@ -2315,13 +2278,11 @@ Address irgen::emitOpaqueBoxedExistentialProjection(
                       wtables);
   }
 
+  Address buffer = layout.projectExistentialBuffer(IGF, base);
   auto *projectFunc =
       getProjectBoxedOpaqueExistentialFunction(IGF, accessKind, layout);
-  auto *bufferAddr = IGF.Builder.CreateBitCast(
-      base.getAddress(),
-      IGF.IGM.getExistentialPtrTy(layout.getNumTables()));
   auto *addrOfValue =
-      IGF.Builder.CreateCall(projectFunc, {bufferAddr, metadata});
+      IGF.Builder.CreateCall(projectFunc, {buffer.getAddress(), metadata});
   addrOfValue->setCallingConv(IGF.IGM.DefaultCC);
   addrOfValue->setDoesNotThrow();
 
@@ -2348,10 +2309,10 @@ static void initBufferWithCopyOfReference(IRGenFunction &IGF,
 }
 
 static llvm::Constant *getAssignBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout) {
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy) {
 
-  llvm::Type *argTys[] = {IGM.getExistentialPtrTy(existLayout.getNumTables()),
-                          IGM.getExistentialPtrTy(existLayout.getNumTables())};
+  llvm::Type *argTys[] = {existContainerPointerTy, existContainerPointerTy};
 
   // __swift_assign_box_in_existentials_N is the well-known function for
   // assigning buffers in existential containers of types with N witness
@@ -2567,9 +2528,10 @@ static llvm::Constant *getAssignBoxedOpaqueExistentialBufferFunction(
 }
 
 static llvm::Constant *getDestroyBoxedOpaqueExistentialBufferFunction(
-    IRGenModule &IGM, OpaqueExistentialLayout existLayout) {
+    IRGenModule &IGM, OpaqueExistentialLayout existLayout,
+    llvm::Type *existContainerPointerTy) {
 
-  llvm::Type *argTys[] = {IGM.getExistentialPtrTy(existLayout.getNumTables())};
+  llvm::Type *argTys[] = {existContainerPointerTy};
 
   llvm::SmallString<40> fnName;
   llvm::raw_svector_ostream(fnName)

branches/master-rebranch/lib/IRGen/GenType.h

@@ -117,9 +117,6 @@ class TypeConverter {
   llvm::StringMap<YAMLTypeInfoNode> LegacyTypeInfos;
   llvm::DenseMap<NominalTypeDecl *, std::string> DeclMangledNames;
 
-  /// The key is the number of witness tables.
-  llvm::DenseMap<unsigned, llvm::StructType *> OpaqueExistentialTypes;
-
   const LoadableTypeInfo *createPrimitive(llvm::Type *T,
                                           Size size, Alignment align);
   const LoadableTypeInfo *createPrimitiveForAlignedPointer(llvm::PointerType *T,
@@ -185,8 +182,6 @@ class TypeConverter {
                                             bool isOptional);
 #include "swift/AST/ReferenceStorage.def"
 
-  llvm::Type *getExistentialType(unsigned numWitnessTables);
-
   /// Enter a generic context for lowering the parameters of a generic function
   /// type.
   void pushGenericContext(CanGenericSignature signature);

branches/master-rebranch/lib/IRGen/IRGenModule.h

@@ -725,7 +725,6 @@ class IRGenModule {
                                                ReferenceCounting style) const;
 
   llvm::Type *getFixedBufferTy();
-  llvm::PointerType *getExistentialPtrTy(unsigned numTables);
   llvm::Type *getValueWitnessTy(ValueWitness index);
   Signature getValueWitnessSignature(ValueWitness index);