---

swift-ci · swift-ci · commit 1aa840ec7d7a · 2018-08-28T00:29:48.000-07:00
yaml --- r: 345039 b: refs/heads/master c: 45f4eea h: refs/heads/master i: 345037: 5cfb4ce 345035: 83f3575 345031: 83c475d 345023: 2ba59f2
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8303f90b44083664cd645823163bd1f0e45ef7a3
+refs/heads/master: 45f4eeaab6afd12b2353b3a3454c8d7282daa987
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
diff --git a/trunk/lib/AST/ASTContext.cpp b/trunk/lib/AST/ASTContext.cpp
@@ -3639,7 +3639,7 @@ FunctionType *FunctionType::getOld(Type input, Type result,
   AnyFunctionType::decomposeInput(input, params);
   void *mem = C.Allocate(sizeof(FunctionType) +
                            sizeof(AnyFunctionType::Param) * params.size(),
-                         alignof(FunctionType));
+                         alignof(FunctionType), arena);
   return Entry = new (mem) FunctionType(params, input, result,
                                         properties, info);
 }

Original file line number	Diff line number	Diff line change
`@@ -3639,7 +3639,7 @@ FunctionType *FunctionType::getOld(Type input, Type result,`
`3639`	`3639`	`AnyFunctionType::decomposeInput(input, params);`
`3640`	`3640`	`void *mem = C.Allocate(sizeof(FunctionType) +`
`3641`	`3641`	`sizeof(AnyFunctionType::Param) * params.size(),`
`3642`		`- alignof(FunctionType));`
	`3642`	`+ alignof(FunctionType), arena);`
`3643`	`3643`	`return Entry = new (mem) FunctionType(params, input, result,`
`3644`	`3644`	`properties, info);`
`3645`	`3645`	`}`