---

yaml
---
r: 326515
b: refs/heads/tensorflow
c: da39eec
h: refs/heads/master
i:
  326513: d39c7c5
  326511: c8d8e46

Author: xedin

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 47a254bfee2329347c8ae623d6098a2f04a620d2
+refs/heads/tensorflow: da39eec95ebd9d0ffae2f6ff0826c51d2e9198cb
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/include/swift/AST/DiagnosticsSema.def

@@ -81,6 +81,13 @@ ERROR(could_not_find_value_member,none,
 ERROR(could_not_find_value_member_corrected,none,
       "value of type %0 has no member %1; did you mean %2?",
       (Type, DeclName, DeclName))
+ERROR(could_not_find_value_dynamic_member_corrected,none,
+      "value of type %0 has no dynamic member %2 using key path from root type %1; did you mean %3?",
+      (Type, Type, DeclName, DeclName))
+ERROR(could_not_find_value_dynamic_member,none,
+      "value of type %0 has no dynamic member %2 using key path from root type %1",
+      (Type, Type, DeclName))
+
 ERROR(could_not_find_type_member,none,
       "type %0 has no member %1", (Type, DeclName))
 ERROR(could_not_find_type_member_corrected,none,
@@ -3393,6 +3400,18 @@ ERROR(pattern_type_mismatch_context,none,
 
 ERROR(tuple_pattern_in_non_tuple_context,none,
       "tuple pattern cannot match values of the non-tuple type %0", (Type))
+WARNING(matching_pattern_with_many_assoc_values, none,
+        "cannot match several associated values at once, "
+        "implicitly tupling the associated values and trying to match that "
+        "instead", ())
+WARNING(matching_tuple_pattern_with_many_assoc_values,none,
+        "a tuple pattern cannot match several associated values at once, "
+        "implicitly tupling the associated values and trying to match "
+        "that instead", ())
+WARNING(matching_many_patterns_with_tupled_assoc_value,none,
+        "the enum case has a single tuple as an associated value, but "
+        "there are several patterns here, implicitly tupling the patterns "
+        "and trying to match that instead", ())
 ERROR(closure_argument_list_tuple,none,
       "contextual closure type %0 expects %1 argument%s1, "
       "but %2 %select{were|was}3 used in closure body", (Type, unsigned, unsigned, bool))

branches/tensorflow/include/swift/AST/NameLookupTypeIDZone.def

@@ -21,4 +21,4 @@ SWIFT_TYPEID(ExtendedNominalRequest)
 SWIFT_TYPEID(SelfBoundsFromWhereClauseRequest)
 SWIFT_TYPEID(TypeDeclsFromWhereClauseRequest)
 SWIFT_TYPEID(CustomAttrNominalRequest)
-SWIFT_TYPEID(GetDestructorRequest)
+SWIFT_TYPEID(GetDestructorRequest)

branches/tensorflow/include/swift/AST/PatternNodes.def

@@ -32,17 +32,19 @@
 #define LAST_PATTERN(Id)
 #endif
 
-PATTERN(Paren, Pattern)
-PATTERN(Tuple, Pattern)
-PATTERN(Named, Pattern)
-PATTERN(Any, Pattern)
-PATTERN(Typed, Pattern)
-PATTERN(Var, Pattern)
-REFUTABLE_PATTERN(Is, Pattern)
-REFUTABLE_PATTERN(EnumElement, Pattern)
-REFUTABLE_PATTERN(OptionalSome, Pattern)
-REFUTABLE_PATTERN(Bool, Pattern)
-REFUTABLE_PATTERN(Expr, Pattern)
+// Metavars: x (variable), pat (pattern), e (expression)
+PATTERN(Paren, Pattern) // (pat)
+PATTERN(Tuple, Pattern) // (pat1, ..., patN), N >= 1
+PATTERN(Named, Pattern) // let pat, var pat
+PATTERN(Any, Pattern)   // _
+PATTERN(Typed, Pattern) // pat : type
+PATTERN(Var, Pattern)   // x
+REFUTABLE_PATTERN(Is, Pattern)           // x is myclass
+REFUTABLE_PATTERN(EnumElement, Pattern)  // .mycase(pat1, ..., patN)
+                                         // MyType.mycase(pat1, ..., patN)
+REFUTABLE_PATTERN(OptionalSome, Pattern) // pat?  nil
+REFUTABLE_PATTERN(Bool, Pattern)         // true, false
+REFUTABLE_PATTERN(Expr, Pattern)         // e
 LAST_PATTERN(Expr)
 
 #undef REFUTABLE_PATTERN

branches/tensorflow/include/swift/Basic/CTypeIDZone.def

@@ -39,4 +39,4 @@ SWIFT_TYPEID_TEMPLATE1_NAMED(std::vector, Vector, typename T, T)
 
 // LLVM ADT types.
 SWIFT_TYPEID_TEMPLATE1_NAMED(llvm::TinyPtrVector, TinyPtrVector, typename T, T)
-SWIFT_TYPEID_TEMPLATE1_NAMED(llvm::ArrayRef, ArrayRef, typename T, T)
+SWIFT_TYPEID_TEMPLATE1_NAMED(llvm::ArrayRef, ArrayRef, typename T, T)

branches/tensorflow/include/swift/SIL/ApplySite.h

@@ -264,7 +264,8 @@ class ApplySite {
   /// Returns true if \p oper is an argument operand and not the callee
   /// operand.
   bool isArgumentOperand(const Operand &oper) const {
-    return oper.getOperandNumber() >= getOperandIndexOfFirstArgument();
+    return oper.getOperandNumber() >= getOperandIndexOfFirstArgument() &&
+      oper.getOperandNumber() < getOperandIndexOfFirstArgument() + getNumArguments();
   }
 
   /// Return the applied argument index for the given operand.