Merge pull request swiftlang#26246 from DougGregor/property-wrapper-crash-fixes

Author: swift-ci

lib/AST/Decl.cpp

@@ -5871,16 +5871,16 @@ Expr *swift::findOriginalPropertyWrapperInitialValue(VarDecl *var,
 
         // ... producing a value of the same nominal type as the innermost
         // property wrapper.
-        if (call->getType()->getAnyNominal() != innermostNominal)
+        if (!call->getType() ||
+            call->getType()->getAnyNominal() != innermostNominal)
           return { true, E };
 
         // Find the implicit initialValue argument.
         if (auto tuple = dyn_cast<TupleExpr>(call->getArg())) {
           ASTContext &ctx = innermostNominal->getASTContext();
           for (unsigned i : range(tuple->getNumElements())) {
-            if ((tuple->getElementName(i) == ctx.Id_wrappedValue ||
-                 tuple->getElementName(i) == ctx.Id_initialValue) &&
-                tuple->getElementNameLoc(i).isInvalid()) {
+            if (tuple->getElementName(i) == ctx.Id_wrappedValue ||
+                tuple->getElementName(i) == ctx.Id_initialValue) {
               initArg = tuple->getElement(i);
               return { false, E };
             }

lib/Sema/CSDiagnostics.cpp

@@ -2912,14 +2912,22 @@ bool OutOfOrderArgumentFailure::diagnoseAsError() {
   SourceLoc diagLoc = firstRange.Start;
 
   auto addFixIts = [&](InFlightDiagnostic diag) {
+    // Don't add Fix-Its if one of the ranges is outside of the argument
+    // list, which can happen when we're splicing together an argument list
+    // from multiple sources.
+    auto &SM = getASTContext().SourceMgr;
+    auto argsRange = tuple->getSourceRange();
+    if (!SM.rangeContains(argsRange, firstRange) ||
+        !SM.rangeContains(argsRange, secondRange))
+      return;
+
     diag.highlight(firstRange).highlight(secondRange);
 
     // Move the misplaced argument by removing it from one location and
     // inserting it in another location. To maintain argument comma
     // separation, since the argument is always moving to an earlier index
     // the preceding comma and whitespace is removed and a new trailing
     // comma and space is inserted with the moved argument.
-    auto &SM = getASTContext().SourceMgr;
     auto text = SM.extractText(
         Lexer::getCharSourceRangeFromSourceRange(SM, firstRange));
 

lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -654,6 +654,8 @@ Expr *swift::buildPropertyWrapperInitialValueCall(
         wrapperAttrs[i]->getTypeLoc().getLoc(),
         wrapperType, ctx);
 
+    SourceLoc startLoc = wrapperAttrs[i]->getTypeLoc().getSourceRange().Start;
+
     // If there were no arguments provided for the attribute at this level,
     // call `init(wrappedValue:)` directly.
     auto attr = wrapperAttrs[i];
@@ -664,8 +666,10 @@ Expr *swift::buildPropertyWrapperInitialValueCall(
         argName = init->getFullName().getArgumentNames()[0];
       }
 
-      initializer = CallExpr::createImplicit(
-          ctx, typeExpr, {initializer}, {argName});
+      initializer = CallExpr::create(
+         ctx, typeExpr, startLoc, {initializer}, {argName},
+         {initializer->getStartLoc()}, initializer->getEndLoc(),
+         nullptr, /*implicit=*/true);
       continue;
     }
 
@@ -675,7 +679,7 @@ Expr *swift::buildPropertyWrapperInitialValueCall(
     SmallVector<SourceLoc, 4> elementLocs;
     elements.push_back(initializer);
     elementNames.push_back(ctx.Id_wrappedValue);
-    elementLocs.push_back(SourceLoc());
+    elementLocs.push_back(initializer->getStartLoc());
 
     if (auto tuple = dyn_cast<TupleExpr>(attr->getArg())) {
       for (unsigned i : range(tuple->getNumElements())) {
@@ -690,8 +694,9 @@ Expr *swift::buildPropertyWrapperInitialValueCall(
       elementLocs.push_back(SourceLoc());
     }
 
-    initializer = CallExpr::createImplicit(
-        ctx, typeExpr, elements, elementNames);
+    initializer = CallExpr::create(
+        ctx, typeExpr, startLoc, elements, elementNames, elementLocs,
+        attr->getArg()->getEndLoc(), nullptr, /*implicit=*/true);
   }
 
   return initializer;

test/decl/var/property_wrappers.swift

@@ -903,6 +903,18 @@ struct TestAlias {
   @Alias var foo = 17
 }
 
+// rdar://problem/52969503 - crash due to invalid source ranges in ill-formed
+// code.
+@propertyWrapper
+struct Wrap52969503<T> {
+  var wrappedValue: T
+
+  init(blah: Int, wrappedValue: T) { }
+}
+
+struct Test52969503 {
+  @Wrap52969503(blah: 5) var foo: Int = 1 // expected-error{{argument 'blah' must precede argument 'wrappedValue'}}
+}
 
 
 // 

validation-test/compiler_crashers_2_fixed/0201-rdar53120878.swift

@@ -0,0 +1,4 @@
+// RUN: not %target-swift-frontend -typecheck %s
+public struct Use { @Wrap var value: some Doubl = 1.0 }
+@propertyWrapper public struct Wrap { public var wrappedValue: Double }
+

validation-test/compiler_crashers_2_fixed/0202-rdar53183030.swift

@@ -0,0 +1,21 @@
+// RUN: not %target-swift-frontend -typecheck %s
+protocol MyBindableObject {}
+
+@propertyWrapper
+struct MyBinding<T> where T : MyBindableObject {
+    public var wrappedV: T
+    public var wrapperValue: MyBinding<T> {
+        return self
+    }
+    public init(initialValue: T) {
+        self.value = initialValue
+    }
+}
+class BeaconDetector: MyBindableObject {
+    struct ContentView {
+        @MyBinding var detector = BeaconDetector()
+        func foo() {
+            _ = detector.undefined == 1
+        }
+    }
+}