---

yaml
---
r: 343727
b: refs/heads/master-rebranch
c: 019a13a
h: refs/heads/master
i:
  343725: d1c3a55
  343723: d2b5711
  343719: 1b8238c
  343711: 1432671

Author: rintaro

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: c13f68881a1e15369c789db476e05269f1df1384
+refs/heads/master-rebranch: 019a13ab7027a2d3a58c184e53e38a5f01dc7a22
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/include/swift/Parse/ASTGen.h

@@ -97,10 +97,6 @@ class ASTGen {
 
   static SourceLoc advanceLocBegin(const SourceLoc &Loc,
                                    const syntax::Syntax &Node);
-  static SourceLoc advanceLocEnd(const SourceLoc &Loc,
-                                 const syntax::TokenSyntax &Token);
-  static SourceLoc advanceLocAfter(const SourceLoc &Loc,
-                                   const syntax::Syntax &Node);
 
   static MagicIdentifierLiteralExpr::Kind getMagicIdentifierLiteralKind(tok Kind);
 

branches/master-rebranch/lib/Parse/ASTGen.cpp

@@ -224,10 +224,8 @@ TypeRepr *ASTGen::generate(AttributedTypeSyntax Type, SourceLoc &Loc) {
 
       if (AttrKind == TAK_convention) {
         auto Argument = Attr.getArgument()->castTo<TokenSyntax>();
-        auto Begin = advanceLocBegin(Loc, Argument);
-        auto End = advanceLocEnd(Loc, Argument);
-        CharSourceRange Range{Context.SourceMgr, Begin, End};
-        TypeAttrs.convention = Range.str();
+        auto Convention = Context.getIdentifier(Argument.getText());
+        TypeAttrs.convention = Convention.str();
       }
 
       if (AttrKind == TAK_opened) {
@@ -545,15 +543,6 @@ SourceLoc ASTGen::advanceLocBegin(const SourceLoc &Loc, const Syntax &Node) {
   return Loc.getAdvancedLoc(Node.getAbsolutePosition().getOffset());
 }
 
-SourceLoc ASTGen::advanceLocEnd(const SourceLoc &Loc, const TokenSyntax &Token) {
-  return advanceLocAfter(Loc, Token.withTrailingTrivia({}));
-}
-
-SourceLoc ASTGen::advanceLocAfter(const SourceLoc &Loc, const Syntax &Node) {
-  return Loc.getAdvancedLoc(
-      Node.getAbsoluteEndPositionAfterTrailingTrivia().getOffset());
-}
-
 StringRef ASTGen::copyAndStripUnderscores(StringRef Orig) {
   return copyAndStripUnderscores(Orig, Context);
 }