---

yaml
---
r: 342001
b: refs/heads/rxwei-patch-1
c: b36f772
h: refs/heads/master
i:
  341999: 2588646

Author: theblixguy

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: c1c4ca5e0a22707986829f9ca6555d9ce7983416
+refs/heads/rxwei-patch-1: b36f772a6be9d0bbfd6d0252577c4b1af96057dd
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/Sema/CSDiag.cpp

@@ -3353,19 +3353,30 @@ class ArgumentMatcher : public MatchCallArgumentListener {
   }
 
   bool isPropertyWrapperImplicitInit() {
-    if (auto TE = dyn_cast<TypeExpr>(FnExpr)) {
-      if (TE->getInstanceType()
-              ->getAnyNominal()
-              ->getAttrs()
-              .hasAttribute<PropertyWrapperAttr>()) {
-        if (auto parent = CandidateInfo.CS.getParentExpr(FnExpr)) {
-          if (auto CE = dyn_cast<CallExpr>(parent)) {
-            return CE->isImplicit();
-          }
-        }
-      }
-    }
-    return false;
+    auto TE = dyn_cast<TypeExpr>(FnExpr);
+    if (!TE)
+      return false;
+
+    auto instanceTy = TE->getInstanceType();
+    if (!instanceTy)
+      return false;
+
+    auto nominalDecl = instanceTy->getAnyNominal();
+    if (!nominalDecl)
+      return false;
+
+    if (!nominalDecl->getAttrs().hasAttribute<PropertyWrapperAttr>())
+      return false;
+
+    auto parent = CandidateInfo.CS.getParentExpr(FnExpr);
+    if (!parent)
+      return false;
+
+    auto CE = dyn_cast<CallExpr>(parent);
+    if (!CE)
+      return false;
+
+    return CE->isImplicit();
   }
 
   bool missingLabel(unsigned paramIdx) override {