---

yaml
---
r: 293503
b: refs/heads/tensorflow
c: 31effa7
h: refs/heads/master
i:
  293501: b0a5eb5
  293499: cb40e28
  293495: c640911
  293487: 6bdf7ec
  293471: 3b3b78e
  293439: d344aab
  293375: 093a42c

Author: aschwaighofer

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 1fbf5f1cc361f855436aa3e5c000e0a3919fb4c9
+refs/heads/tensorflow: 31effa71b0d93dca7ec54c661e3fd63d1821707a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/SILOptimizer/Transforms/SpecializeOpaqueArchetypes.cpp

@@ -111,8 +111,7 @@ void OpaqueSpecializerCloner::insertOpaqueToConcreteAddressCasts(
     auto argIdx = apply.getCalleeArgIndex(opd);
     auto argType = substConv.getSILArgumentType(argIdx);
     if (argConv.isIndirectConvention() &&
-        argType.getASTType()->hasOpaqueArchetype() &&
-        !opd.get()->getType().getASTType()->hasOpaqueArchetype()) {
+        argType.getASTType() != opd.get()->getType().getASTType()) {
       auto cast = getBuilder().createUncheckedAddrCast(apply.getLoc(),
                                                        opd.get(), argType);
       opd.set(cast);
@@ -131,7 +130,7 @@ class OpaqueArchetypeSpecializer : public SILFunctionTransform {
       for (auto &inst : BB) {
         auto *allocStack = dyn_cast<AllocStackInst>(&inst);
         if (!allocStack ||
-            !allocStack->getElementType().is<OpaqueTypeArchetypeType>())
+            !allocStack->getElementType().getASTType()->hasOpaqueArchetype())
           continue;
         foundOpaqueArchetype = true;
         break;