---

yaml
---
r: 348571
b: refs/heads/master
c: b62b6fb
h: refs/heads/master
i:
  348569: 450a2a9
  348567: e904104

Author: swift-ci

[refs]

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

trunk/lib/IRGen/GenMeta.cpp

@@ -1684,14 +1684,16 @@ namespace {
     }
 
     void addUnderlyingTypeAndConformances() {
-      auto sig = O->getOpaqueInterfaceGenericSignature()
-        ? O->getOpaqueInterfaceGenericSignature()->getCanonicalSignature()
-        : CanGenericSignature();
+      auto sig = O->getOpaqueInterfaceGenericSignature();
       auto underlyingType = Type(O->getUnderlyingInterfaceType())
         .subst(*O->getUnderlyingTypeSubstitutions())
         ->getCanonicalType(sig);
+      
+      auto contextSig = O->getGenericSignature()
+        ? O->getGenericSignature()->getCanonicalSignature()
+        : CanGenericSignature();
 
-      B.addRelativeAddress(IGM.getTypeRef(underlyingType, sig,
+      B.addRelativeAddress(IGM.getTypeRef(underlyingType, contextSig,
                                           MangledTypeRefRole::Metadata).first);
 
       auto opaqueType = O->getDeclaredInterfaceType()
@@ -1705,7 +1707,7 @@ namespace {
 
         auto witnessTableRef = IGM.emitWitnessTableRefString(
                                           underlyingType, underlyingConformance,
-                                          O->getGenericSignature(),
+                                          contextSig,
                                           /*setLowBit*/ false);
         B.addRelativeAddress(witnessTableRef);
       }

trunk/tools/swift-api-digester/swift-api-digester.cpp

@@ -130,6 +130,10 @@ static llvm::cl::opt<bool>
 Verbose("v", llvm::cl::desc("Verbose"),
         llvm::cl::cat(Category));
 
+static llvm::cl::opt<bool>
+DebugMapping("debug-mapping", llvm::cl::desc("Dumping information for debug purposes"),
+             llvm::cl::cat(Category));
+
 static llvm::cl::opt<bool>
 Abi("abi", llvm::cl::desc("Dumping ABI interface"),  llvm::cl::init(false),
     llvm::cl::cat(Category));
@@ -1090,7 +1094,7 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
     ProtocolReqWhitelist(std::move(prWhitelist)) {}
 
   void foundMatch(NodePtr Left, NodePtr Right, NodeMatchReason Reason) override {
-    if (options::Verbose)
+    if (options::DebugMapping)
       debugMatch(Left, Right, Reason, llvm::errs());
     switch (Reason) {
     case NodeMatchReason::Added: