---

yaml
---
r: 348861
b: refs/heads/master
c: 3f66608
h: refs/heads/master
i:
  348859: befb8a3

Author: hamishknight

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c1a1ddd458032a12f3be543314e7f9767f11aba3
+refs/heads/master: 3f66608cb591fd2f3bae6da3749109a37f894646
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/Decl.h

@@ -5824,11 +5824,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     return getBodyKind() == BodyKind::MemberwiseInitializer;
   }
 
-  void setNeedsNewVTableEntry(bool value) {
-    LazySemanticInfo.NeedsNewVTableEntryComputed = true;
-    LazySemanticInfo.NeedsNewVTableEntry = value;
-  }
-
   /// For a method of a class, checks whether it will require a new entry in the
   /// vtable.
   bool needsNewVTableEntry() const;

trunk/lib/Sema/CodeSynthesis.cpp

@@ -702,8 +702,6 @@ createDesignatedInitOverride(ClassDecl *classDecl,
     // Note that this is a stub implementation.
     ctor->setStubImplementation(true);
 
-    // Stub constructors don't appear in the vtable.
-    ctor->setNeedsNewVTableEntry(false);
     return ctor;
   }
 

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -1392,6 +1392,10 @@ NeedsNewVTableEntryRequest::evaluate(Evaluator &evaluator,
     if (!ctor->isRequired() && !ctor->isDesignatedInit()) {
       return false;
     }
+
+    // Stub constructors don't appear in the vtable.
+    if (ctor->hasStubImplementation())
+      return false;
   }
 
   if (auto *accessor = dyn_cast<AccessorDecl>(decl)) {