---

yaml
---
r: 344923
b: refs/heads/master
c: 2b90622
h: refs/heads/master
i:
  344921: ba2081e
  344919: 260357e

Author: swift-ci

[refs]

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

trunk/lib/Sema/TypeCheckProtocol.cpp

@@ -3486,6 +3486,10 @@ void ConformanceChecker::checkConformance(MissingWitnessDiagnosisKind Kind) {
       auto witness = Conformance->getWitness(requirement, nullptr).getDecl();
       if (!witness) return;
 
+      // Make sure that we finalize the witness, so we can emit this
+      // witness table.
+      TC.DeclsToFinalize.insert(witness);
+
       // Objective-C checking for @objc requirements.
       if (requirement->isObjC() &&
           requirement->getFullName() == witness->getFullName() &&

trunk/test/multifile/Inputs/require-finalize-witness-other.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+extension C {
+  @objc func foo(_: String) { }
+}

trunk/test/multifile/require-finalize-witness.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-frontend -module-name test -emit-ir -primary-file %s %S/Inputs/require-finalize-witness-other.swift -sdk %sdk -o - | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+import Foundation
+
+@objc class C: NSObject { }
+
+protocol P {
+  func foo(_: String)
+}
+
+// CHECK: define {{.*}} @"$S4test1CCAA1PA2aDP3fooyySSFTW"
+extension C: P { }