Merge pull request #19298 from compnerd/trailing-msvc

swift-ci · web-flow · commit 1281f3ddac8e · 2018-09-16T17:46:16.000-07:00
diff --git a/lib/IRGen/GenExistential.cpp b/lib/IRGen/GenExistential.cpp
@@ -150,8 +150,9 @@ namespace {
     create(ArrayRef<const ProtocolDecl *> protocols, As &&...args)
     {
       void *buffer = operator new(
-          ExistentialTypeInfoBase::template totalSizeToAlloc<
-            const ProtocolDecl *>(protocols.size()));
+          llvm::TrailingObjects<Derived, const ProtocolDecl *>::
+              template totalSizeToAlloc<const ProtocolDecl *>(
+                  protocols.size()));
       return new (buffer) Derived(protocols, std::forward<As>(args)...);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,9 @@ namespace {`
`150`	`150`	`create(ArrayRef<const ProtocolDecl *> protocols, As &&...args)`
`151`	`151`	`{`
`152`	`152`	`void *buffer = operator new(`
`153`		`- ExistentialTypeInfoBase::template totalSizeToAlloc<`
`154`		`- const ProtocolDecl *>(protocols.size()));`
	`153`	`+ llvm::TrailingObjects<Derived, const ProtocolDecl *>::`
	`154`	`+ template totalSizeToAlloc<const ProtocolDecl *>(`
	`155`	`+ protocols.size()));`
`155`	`156`	`return new (buffer) Derived(protocols, std::forward<As>(args)...);`
`156`	`157`	`}`
`157`	`158`