---

yaml
---
r: 286655
b: refs/heads/master-next
c: 6966f12
h: refs/heads/master
i:
  286653: b874c38
  286651: f9f114f
  286647: 6109041
  286639: 5a51dfc
  286623: 0de1790
  286591: f358a22

Author: aschwaighofer

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: a67ffadd758dfc7a0f10a8afde063b8864663208
-refs/heads/master-next: 8cb4456d337f99dea8bca08901c8b554f1e65d58
+refs/heads/master-next: 6966f12f9e91dc3d5d675ec1b209aa2d3f27e971
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/SILOptimizer/Transforms/SpecializeOpaqueArchetypes.cpp

@@ -133,18 +133,30 @@ class OpaqueSpecializerCloner
   void visitEnumInst(EnumInst *Inst) {
     getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
     SILValue opd = SILValue();
+    auto newTy = getOpType(Inst->getType());
     if (Inst->hasOperand()) {
-      SILType caseTy = Inst->getType().getEnumElementType(
-          Inst->getElement(), getBuilder().getFunction().getModule());
       opd = getOpValue(Inst->getOperand());
-      if (opd->getType() != caseTy) {
-        opd = createCast(getOpLocation(Inst->getLoc()), opd, caseTy);
-      }
+      SILType newCaseTy = newTy.getEnumElementType(
+          Inst->getElement(), getBuilder().getFunction().getModule());
+      if (opd->getType() != newCaseTy)
+        opd = createCast(getOpLocation(Inst->getLoc()), opd, newCaseTy);
     }
     recordClonedInstruction(
         Inst, getBuilder().createEnum(getOpLocation(Inst->getLoc()), opd,
-                                      Inst->getElement(),
-                                      getOpType(Inst->getType())));
+                                      Inst->getElement(), newTy));
+  }
+
+  void visitInitEnumDataAddrInst(InitEnumDataAddrInst *Inst) {
+    getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
+    auto opd = getOpValue(Inst->getOperand());
+    auto caseTy = opd->getType().getEnumElementType(
+        Inst->getElement(), getBuilder().getFunction().getModule());
+    auto expectedTy = getOpType(Inst->getType());
+    if (expectedTy != caseTy)
+      expectedTy = caseTy;
+    recordClonedInstruction(Inst, getBuilder().createInitEnumDataAddr(
+                                      getOpLocation(Inst->getLoc()), opd,
+                                      Inst->getElement(), expectedTy));
   }
 
   /// Projections should not change the type if the type is not specialized.