[SILGen] Move thunk emission to emitFunctionDefinition

Author: hamishknight

lib/SILGen/SILGen.cpp

@@ -677,6 +677,39 @@ bool SILGenModule::hasFunction(SILDeclRef constant) {
 void SILGenModule::visitFuncDecl(FuncDecl *fd) { emitFunction(fd); }
 
 void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
+
+  if (constant.isForeignToNativeThunk()) {
+    f->setThunk(IsThunk);
+    if (constant.asForeign().isClangGenerated())
+      f->setSerialized(IsSerializable);
+
+    auto loc = constant.getAsRegularLocation();
+    loc.markAutoGenerated();
+    auto *dc = loc.getAsDeclContext();
+    assert(dc);
+
+    preEmitFunction(constant, f, loc);
+    PrettyStackTraceSILFunction X("silgen emitForeignToNativeThunk", f);
+    SILGenFunction(*this, *f, dc).emitForeignToNativeThunk(constant);
+    postEmitFunction(constant, f);
+    return;
+  }
+
+  if (constant.isNativeToForeignThunk()) {
+    auto loc = constant.getAsRegularLocation();
+    loc.markAutoGenerated();
+    auto *dc = loc.getAsDeclContext();
+    assert(dc);
+
+    preEmitFunction(constant, f, loc);
+    PrettyStackTraceSILFunction X("silgen emitNativeToForeignThunk", f);
+    f->setBare(IsBare);
+    f->setThunk(IsThunk);
+    SILGenFunction(*this, *f, dc).emitNativeToForeignThunk(constant);
+    postEmitFunction(constant, f);
+    return;
+  }
+
   switch (constant.kind) {
   case SILDeclRef::Kind::Func: {
     if (auto *ce = constant.getAbstractClosureExpr()) {
@@ -1412,14 +1445,7 @@ void SILGenModule::emitObjCMethodThunk(FuncDecl *method) {
     return;
 
   // ObjC entry points are always externally usable, so can't be delay-emitted.
-
-  SILFunction *f = getFunction(thunk, ForDefinition);
-  preEmitFunction(thunk, f, method);
-  PrettyStackTraceSILFunction X("silgen emitObjCMethodThunk", f);
-  f->setBare(IsBare);
-  f->setThunk(IsThunk);
-  SILGenFunction(*this, *f, method).emitNativeToForeignThunk(thunk);
-  postEmitFunction(thunk, f);
+  emitNativeToForeignThunk(thunk);
 }
 
 void SILGenModule::emitObjCPropertyMethodThunks(AbstractStorageDecl *prop) {
@@ -1435,33 +1461,17 @@ void SILGenModule::emitObjCPropertyMethodThunks(AbstractStorageDecl *prop) {
   if (hasFunction(getterRef))
     return;
 
-  auto thunkBodyLoc = RegularLocation::getAutoGeneratedLocation(prop);
   // ObjC entry points are always externally usable, so emitting can't be
   // delayed.
-  {
-    SILFunction *f = getFunction(getterRef, ForDefinition);
-    preEmitFunction(getterRef, f, thunkBodyLoc);
-    PrettyStackTraceSILFunction X("silgen objc property getter thunk", f);
-    f->setBare(IsBare);
-    f->setThunk(IsThunk);
-    SILGenFunction(*this, *f, getter).emitNativeToForeignThunk(getterRef);
-    postEmitFunction(getterRef, f);
-  }
+  emitNativeToForeignThunk(getterRef);
 
   if (!prop->isSettable(prop->getDeclContext()))
     return;
 
   // FIXME: Add proper location.
   auto *setter = prop->getOpaqueAccessor(AccessorKind::Set);
   auto setterRef = SILDeclRef(setter, SILDeclRef::Kind::Func).asForeign();
-
-  SILFunction *f = getFunction(setterRef, ForDefinition);
-  preEmitFunction(setterRef, f, thunkBodyLoc);
-  PrettyStackTraceSILFunction X("silgen objc property setter thunk", f);
-  f->setBare(IsBare);
-  f->setThunk(IsThunk);
-  SILGenFunction(*this, *f, setter).emitNativeToForeignThunk(setterRef);
-  postEmitFunction(setterRef, f);
+  emitNativeToForeignThunk(setterRef);
 }
 
 void SILGenModule::emitObjCConstructorThunk(ConstructorDecl *constructor) {
@@ -1473,15 +1483,7 @@ void SILGenModule::emitObjCConstructorThunk(ConstructorDecl *constructor) {
     return;
   // ObjC entry points are always externally usable, so emitting can't be
   // delayed.
-
-  SILFunction *f = getFunction(thunk, ForDefinition);
-  auto loc = RegularLocation::getAutoGeneratedLocation(constructor);
-  preEmitFunction(thunk, f, loc);
-  PrettyStackTraceSILFunction X("silgen objc constructor thunk", f);
-  f->setBare(IsBare);
-  f->setThunk(IsThunk);
-  SILGenFunction(*this, *f, constructor).emitNativeToForeignThunk(thunk);
-  postEmitFunction(thunk, f);
+  emitNativeToForeignThunk(thunk);
 }
 
 void SILGenModule::emitObjCDestructorThunk(DestructorDecl *destructor) {
@@ -1491,14 +1493,8 @@ void SILGenModule::emitObjCDestructorThunk(DestructorDecl *destructor) {
   // Don't emit the thunk if it already exists.
   if (hasFunction(thunk))
     return;
-  SILFunction *f = getFunction(thunk, ForDefinition);
-  auto loc = RegularLocation::getAutoGeneratedLocation(destructor);
-  preEmitFunction(thunk, destructor, f, loc);
-  PrettyStackTraceSILFunction X("silgen objc destructor thunk", f);
-  f->setBare(IsBare);
-  f->setThunk(IsThunk);
-  SILGenFunction(*this, *f, destructor).emitNativeToForeignThunk(thunk);
-  postEmitFunction(thunk, f);
+
+  emitNativeToForeignThunk(thunk);
 }
 
 void SILGenModule::visitPatternBindingDecl(PatternBindingDecl *pd) {

lib/SILGen/SILGenThunk.cpp

@@ -90,31 +90,14 @@ SILGenFunction::emitDynamicMethodRef(SILLocation loc, SILDeclRef constant,
 
 void SILGenModule::emitForeignToNativeThunk(SILDeclRef thunk) {
   // Thunks are always emitted by need, so don't need delayed emission.
-  assert(!thunk.isForeign && "foreign-to-native thunks only");
-  SILFunction *f = getFunction(thunk, ForDefinition);
-  f->setThunk(IsThunk);
-  if (thunk.asForeign().isClangGenerated())
-    f->setSerialized(IsSerializable);
-  preEmitFunction(thunk, f, thunk.getDecl());
-  PrettyStackTraceSILFunction X("silgen emitForeignToNativeThunk", f);
-  SILGenFunction(*this, *f, SwiftModule).emitForeignToNativeThunk(thunk);
-  postEmitFunction(thunk, f);
+  assert(thunk.isForeignToNativeThunk() && "foreign-to-native thunks only");
+  emitFunctionDefinition(thunk, getFunction(thunk, ForDefinition));
 }
 
 void SILGenModule::emitNativeToForeignThunk(SILDeclRef thunk) {
   // Thunks are always emitted by need, so don't need delayed emission.
-  assert(thunk.isForeign && "native-to-foreign thunks only");
-  
-  SILFunction *f = getFunction(thunk, ForDefinition);
-  if (thunk.hasDecl())
-    preEmitFunction(thunk, f, thunk.getDecl());
-  else
-    preEmitFunction(thunk, f, thunk.getAbstractClosureExpr());
-  PrettyStackTraceSILFunction X("silgen emitNativeToForeignThunk", f);
-  f->setBare(IsBare);
-  f->setThunk(IsThunk);
-  SILGenFunction(*this, *f, SwiftModule).emitNativeToForeignThunk(thunk);
-  postEmitFunction(thunk, f);
+  assert(thunk.isNativeToForeignThunk() && "native-to-foreign thunks only");
+  emitFunctionDefinition(thunk, getFunction(thunk, ForDefinition));
 }
 
 SILValue