---

yaml
---
r: 348122
b: refs/heads/master
c: 63e488e
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7fdd67cd20c72f56b6aeb50ce9f1451e3010bd90
+refs/heads/master: 63e488e4f4e8025d655c337b2cc7b12efe538b7e
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILGen/SILGenThunk.cpp

@@ -311,10 +311,15 @@ getOrCreateReabstractionThunk(CanSILFunctionType thunkType,
     ->getCanonicalType();
   auto toInterfaceType = toType->mapTypeOutOfContext()
     ->getCanonicalType();
+  CanType dynamicSelfInterfaceType;
+  if (dynamicSelfType)
+    dynamicSelfInterfaceType = dynamicSelfType->mapTypeOutOfContext()
+      ->getCanonicalType();
 
   Mangle::ASTMangler NewMangler;
   std::string name = NewMangler.mangleReabstractionThunkHelper(thunkType,
-                       fromInterfaceType, toInterfaceType, dynamicSelfType,
+                       fromInterfaceType, toInterfaceType,
+                       dynamicSelfInterfaceType,
                        M.getSwiftModule());
 
   auto loc = RegularLocation::getAutoGeneratedLocation();

trunk/test/SILGen/dynamic_self_reabstraction.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-emit-silgen %s -verify
+
+func foo<T>(_ f: () -> T) -> T { return f() }
+
+class Foo<U> {
+  func bar() -> Self {
+    return foo { self }
+  }
+}