Merge pull request #29832 from rintaro/ast-funcparam-nonull

rintaro · web-flow · commit 20f8436aa5c7 · 2020-02-18T09:33:34.000-08:00
[AST] Ensure AnyFunctionType::Param.Ty is non-null
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
@@ -2780,7 +2780,8 @@ class AnyFunctionType : public TypeBase {
                    Identifier l = Identifier(),
                    ParameterTypeFlags f = ParameterTypeFlags())
         : Ty(t), Label(l), Flags(f) {
-      assert(!t || !t->is<InOutType>() && "set flags instead");
+      assert(t && "param type must be non-null");
+      assert(!t->is<InOutType>() && "set flags instead");
     }
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -2780,7 +2780,8 @@ class AnyFunctionType : public TypeBase {`
`2780`	`2780`	`Identifier l = Identifier(),`
`2781`	`2781`	`ParameterTypeFlags f = ParameterTypeFlags())`
`2782`	`2782`	`: Ty(t), Label(l), Flags(f) {`
`2783`		`- assert(!t \|\| !t->is<InOutType>() && "set flags instead");`
	`2783`	`+ assert(t && "param type must be non-null");`
	`2784`	`+ assert(!t->is<InOutType>() && "set flags instead");`
`2784`	`2785`	`}`
`2785`	`2786`
`2786`	`2787`	`private:`