Merge pull request swiftlang#11208 from CodaFi/paren-de-la-paren

Report nested inout paren types as non-materializable
Ajisaputrars · Jul 26, 2017 · d033648 · d033648
2 parents 2cda3e0 + 43beb80
commit d033648
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -2704,7 +2704,16 @@ Type TupleType::get(ArrayRef<TupleTypeElt> Fields, const ASTContext &C) {
     if (!eltTy) continue;
 
     properties |= eltTy->getRecursiveProperties();
-    hasInOut |= Elt.getParameterFlags().isInOut();
+    // Recur into paren types and canonicalized paren types.  'inout' in nested
+    // non-paren tuples are malformed and will be diagnosed later.
+    if (auto *TTy = Elt.getType()->getAs<TupleType>()) {
+      if (TTy->getNumElements() == 1)
+        hasInOut |= TTy->hasInOutElement();
+    } else if (auto *Pty = dyn_cast<ParenType>(Elt.getType().getPointer())) {
+      hasInOut |= Pty->getParameterFlags().isInOut();
+    } else {
+      hasInOut |= Elt.getParameterFlags().isInOut();
+    }
   }
 
   auto arena = getArena(properties);

diff --git a/...terializablerecursive-may-not-be-in.swift → ...terializablerecursive-may-not-be-in.swift b/...terializablerecursive-may-not-be-in.swift → ...terializablerecursive-may-not-be-in.swift
@@ -6,6 +6,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 // REQUIRES: asserts
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 [(Int
 (t:&_