Merge pull request #13888 from akyrtzi/fix-crash-invalid-entity-walker-4.1
[4.1][AST] Make sure that if a TupleExpr is created with element names but not name locations, it is marked implicit as appropriate
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
index 75f2e93..77b44f0 100644
--- a/lib/AST/ASTDumper.cpp
+++ b/lib/AST/ASTDumper.cpp
@@ -1917,6 +1917,11 @@
}
void visitDictionaryExpr(DictionaryExpr *E) {
printCommon(E, "dictionary_expr");
+ if (auto semaE = E->getSemanticExpr()) {
+ OS << '\n';
+ printRec(semaE);
+ return;
+ }
for (auto elt : E->getElements()) {
OS << '\n';
printRec(elt);
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 03ba1bb..009ddc6 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1197,7 +1197,7 @@
auto arg = TupleExpr::create(ctx, lParenLoc, args, argLabels, argLabelLocs,
rParenLoc, /*HasTrailingClosure=*/false,
- /*Implicit=*/false);
+ implicit);
computeSingleArgumentType(ctx, arg, implicit, getType);
return arg;
}
@@ -1454,6 +1454,16 @@
SourceLoc RParenLoc, bool HasTrailingClosure,
bool Implicit, Type Ty) {
assert(!Ty || isa<TupleType>(Ty.getPointer()));
+ auto hasNonEmptyIdentifier = [](ArrayRef<Identifier> Ids) -> bool {
+ for (auto ident : Ids) {
+ if (!ident.empty())
+ return true;
+ }
+ return false;
+ };
+ assert((Implicit || ElementNames.size() == ElementNameLocs.size() ||
+ (!hasNonEmptyIdentifier(ElementNames) && ElementNameLocs.empty())) &&
+ "trying to create non-implicit tuple-expr without name locations");
size_t size =
totalSizeToAlloc<Expr *, Identifier, SourceLoc>(SubExprs.size(),
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
index ca200b2..0a755f1 100644
--- a/lib/Sema/CSApply.cpp
+++ b/lib/Sema/CSApply.cpp
@@ -2829,7 +2829,7 @@
{ },
expr->getRBracketLoc(),
/*HasTrailingClosure=*/false,
- /*Implicit=*/false,
+ /*Implicit=*/true,
argType);
cs.cacheExprTypes(arg);
diff --git a/test/Index/invalid_code.swift b/test/Index/invalid_code.swift
index ac51993..c5d0693 100644
--- a/test/Index/invalid_code.swift
+++ b/test/Index/invalid_code.swift
@@ -2,3 +2,13 @@
// CHECK: [[@LINE+1]]:8 | struct/Swift | Int | {{.*}} | Ref | rel: 0
var _: Int { get { return 1 } }
+
+class CrashTest {
+ var something = 0
+ func returnSelf(_ h: [AnyHashable: Any?]) -> CrashTest {
+ return self
+ }
+ init() { }
+}
+// CHECK: [[@LINE+1]]:13 | instance-method/Swift | returnSelf
+CrashTest().returnSelf(["": 0]).something()
