---

yaml
---
r: 326495
b: refs/heads/tensorflow
c: a7b5f71
h: refs/heads/master
i:
  326493: 1029c7b
  326491: 991ff80
  326487: 7634fed
  326479: 158c155
  326463: a321eef

Author: LucianoPAlmeida

[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: df14698efd00a482fdbcd4a786f3b88aa0c4ce69
+refs/heads/tensorflow: a7b5f714e4a207b63a571190cad4aa1e122efa36
 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

@@ -82,7 +82,7 @@ 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,
-      "neither the value type %0 and dynamic key path subscript of type %1 has a member %2; did you mean %3?",
+      "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_type_member,none,

branches/tensorflow/lib/Sema/CSDiagnostics.cpp

@@ -2319,7 +2319,6 @@ bool MissingMemberFailure::diagnoseAsError() {
         diagnostic.highlight(baseExpr->getSourceRange())
             .highlight(nameLoc.getSourceRange());
         correction->addFixits(diagnostic);
-        
       } else {
         auto diagnostic = emitDiagnostic(
             anchor->getLoc(),

branches/tensorflow/test/attr/attr_dynamic_member_lookup.swift

@@ -704,7 +704,7 @@ struct SR10597_W<T> {
   var wooo: SR10597 { SR10597() } // expected-note {{declared here}}
 }
 
-_ = SR10597_W<SR10597>(SR10597()).wooooo // expected-error {{neither the value type 'SR10597_W<SR10597>' and dynamic key path subscript of type 'SR10597' has a member 'wooooo'; did you mean 'wooo'?}}
+_ = SR10597_W<SR10597>(SR10597()).wooooo // expected-error {{value of type 'SR10597_W<SR10597>' has no dynamic member 'wooooo' using key path from root type 'SR10597'; did you mean 'wooo'?}}
 
 final class SR10597_1 {
     var woo: Int? // expected-note 2 {{'woo' declared here}}
@@ -719,4 +719,4 @@ struct SR10597_1_W<T> {
   }
 }
 
-_ = SR10597_1_W<SR10597_1>(SR10597_1()).wooo // expected-error {{neither the value type 'SR10597_1_W<SR10597_1>' and dynamic key path subscript of type 'SR10597_1' has a member 'wooo'; did you mean 'woo'?}}
+_ = SR10597_1_W<SR10597_1>(SR10597_1()).wooo // expected-error {{value of type 'SR10597_1_W<SR10597_1>' has no dynamic member 'wooooo' using key path from root type 'SR10597_1'; did you mean 'woo'?}}