Fix a few line endings. NFC.

llvm-svn: 236301

diff --git a/clang/lib/Frontend/Rewrite/RewriteObjC.cpp b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp
index 170c209..b2a45b4 100644 (file)
--- a/clang/lib/Frontend/Rewrite/RewriteObjC.cpp
+++ b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp
@@ -3818,16 +3818,16 @@ Stmt *RewriteObjC::SynthesizeBlockCall(CallExpr *Exp, const Expr *BlockExp) {
   FieldDecl *FD = FieldDecl::Create(*Context, nullptr, SourceLocation(),
                                     SourceLocation(),
                                     &Context->Idents.get("FuncPtr"),
-                                    Context->VoidPtrTy, nullptr,\r
-                                    /*BitWidth=*/nullptr, /*Mutable=*/true,\r
-                                    ICIS_NoInit);\r
-  MemberExpr *ME =\r
-      new (Context) MemberExpr(PE, true, SourceLocation(), FD, SourceLocation(),\r
-                               FD->getType(), VK_LValue, OK_Ordinary);\r
-\r
-  CastExpr *FunkCast = NoTypeInfoCStyleCastExpr(Context, PtrToFuncCastType,\r
-                                                CK_BitCast, ME);\r
-  PE = new (Context) ParenExpr(SourceLocation(), SourceLocation(), FunkCast);\r
+                                    Context->VoidPtrTy, nullptr,
+                                    /*BitWidth=*/nullptr, /*Mutable=*/true,
+                                    ICIS_NoInit);
+  MemberExpr *ME =
+      new (Context) MemberExpr(PE, true, SourceLocation(), FD, SourceLocation(),
+                               FD->getType(), VK_LValue, OK_Ordinary);
+
+  CastExpr *FunkCast = NoTypeInfoCStyleCastExpr(Context, PtrToFuncCastType,
+                                                CK_BitCast, ME);
+  PE = new (Context) ParenExpr(SourceLocation(), SourceLocation(), FunkCast);
 
   SmallVector<Expr*, 8> BlkExprs;
   // Add the implicit argument.
@@ -3866,26 +3866,26 @@ Stmt *RewriteObjC::RewriteBlockDeclRefExpr(DeclRefExpr *DeclRefExp) {
   FieldDecl *FD = FieldDecl::Create(*Context, nullptr, SourceLocation(),
                                     SourceLocation(),
                                     &Context->Idents.get("__forwarding"), 
-                                    Context->VoidPtrTy, nullptr,\r
-                                    /*BitWidth=*/nullptr, /*Mutable=*/true,\r
-                                    ICIS_NoInit);\r
-  MemberExpr *ME = new (Context)\r
-      MemberExpr(DeclRefExp, isArrow, SourceLocation(), FD, SourceLocation(),\r
-                 FD->getType(), VK_LValue, OK_Ordinary);\r
-\r
-  StringRef Name = VD->getName();\r
-  FD = FieldDecl::Create(*Context, nullptr, SourceLocation(), SourceLocation(),\r
+                                    Context->VoidPtrTy, nullptr,
+                                    /*BitWidth=*/nullptr, /*Mutable=*/true,
+                                    ICIS_NoInit);
+  MemberExpr *ME = new (Context)
+      MemberExpr(DeclRefExp, isArrow, SourceLocation(), FD, SourceLocation(),
+                 FD->getType(), VK_LValue, OK_Ordinary);
+
+  StringRef Name = VD->getName();
+  FD = FieldDecl::Create(*Context, nullptr, SourceLocation(), SourceLocation(),
                          &Context->Idents.get(Name), 
-                         Context->VoidPtrTy, nullptr,\r
-                         /*BitWidth=*/nullptr, /*Mutable=*/true,\r
-                         ICIS_NoInit);\r
-  ME =\r
-      new (Context) MemberExpr(ME, true, SourceLocation(), FD, SourceLocation(),\r
-                               DeclRefExp->getType(), VK_LValue, OK_Ordinary);\r
-\r
-  // Need parens to enforce precedence.\r
-  ParenExpr *PE = new (Context) ParenExpr(DeclRefExp->getExprLoc(), \r
-                                          DeclRefExp->getExprLoc(), \r
+                         Context->VoidPtrTy, nullptr,
+                         /*BitWidth=*/nullptr, /*Mutable=*/true,
+                         ICIS_NoInit);
+  ME =
+      new (Context) MemberExpr(ME, true, SourceLocation(), FD, SourceLocation(),
+                               DeclRefExp->getType(), VK_LValue, OK_Ordinary);
+
+  // Need parens to enforce precedence.
+  ParenExpr *PE = new (Context) ParenExpr(DeclRefExp->getExprLoc(), 
+                                          DeclRefExp->getExprLoc(), 
                                           ME);
   ReplaceStmt(DeclRefExp, PE);
   return PE;
@@ -5874,15 +5874,15 @@ Stmt *RewriteObjCFragileABI::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) {
       // Don't forget the parens to enforce the proper binding.
       ParenExpr *PE = new (Context) ParenExpr(OldRange.getBegin(),
                                               OldRange.getEnd(),
-                                              castExpr);\r
-      if (IV->isFreeIvar() &&\r
-          declaresSameEntity(CurMethodDef->getClassInterface(), iFaceDecl->getDecl())) {\r
-        MemberExpr *ME = new (Context)\r
-            MemberExpr(PE, true, SourceLocation(), D, IV->getLocation(),\r
-                       D->getType(), VK_LValue, OK_Ordinary);\r
-        Replacement = ME;\r
-      } else {\r
-        IV->setBase(PE);\r
+                                              castExpr);
+      if (IV->isFreeIvar() &&
+          declaresSameEntity(CurMethodDef->getClassInterface(), iFaceDecl->getDecl())) {
+        MemberExpr *ME = new (Context)
+            MemberExpr(PE, true, SourceLocation(), D, IV->getLocation(),
+                       D->getType(), VK_LValue, OK_Ordinary);
+        Replacement = ME;
+      } else {
+        IV->setBase(PE);
       }
     }
   } else { // we are outside a method.

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 8f9401b..9d87a10 100644 (file)
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -12488,17 +12488,17 @@ Expr *Sema::FixOverloadedFunctionReference(Expr *E, DeclAccessPair Found,
       type = Fn->getType();
     } else {
       valueKind = VK_RValue;
-      type = Context.BoundMemberTy;\r
-    }\r
-\r
-    MemberExpr *ME = MemberExpr::Create(\r
-        Context, Base, MemExpr->isArrow(), MemExpr->getOperatorLoc(),\r
-        MemExpr->getQualifierLoc(), MemExpr->getTemplateKeywordLoc(), Fn, Found,\r
-        MemExpr->getMemberNameInfo(), TemplateArgs, type, valueKind,\r
-        OK_Ordinary);\r
-    ME->setHadMultipleCandidates(true);\r
-    MarkMemberReferenced(ME);\r
-    return ME;\r
+      type = Context.BoundMemberTy;
+    }
+
+    MemberExpr *ME = MemberExpr::Create(
+        Context, Base, MemExpr->isArrow(), MemExpr->getOperatorLoc(),
+        MemExpr->getQualifierLoc(), MemExpr->getTemplateKeywordLoc(), Fn, Found,
+        MemExpr->getMemberNameInfo(), TemplateArgs, type, valueKind,
+        OK_Ordinary);
+    ME->setHadMultipleCandidates(true);
+    MarkMemberReferenced(ME);
+    return ME;
   }
 
   llvm_unreachable("Invalid reference to overloaded function");

diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp
index 57728c1..3329d04 100644 (file)
--- a/clang/lib/Serialization/ASTReaderStmt.cpp
+++ b/clang/lib/Serialization/ASTReaderStmt.cpp
@@ -2488,18 +2488,18 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {
       ExprObjectKind OK = static_cast<ExprObjectKind>(Record[Idx++]);
       Expr *Base = ReadSubExpr();
       ValueDecl *MemberD = ReadDeclAs<ValueDecl>(F, Record, Idx);
-      SourceLocation MemberLoc = ReadSourceLocation(F, Record, Idx);\r
-      DeclarationNameInfo MemberNameInfo(MemberD->getDeclName(), MemberLoc);\r
-      bool IsArrow = Record[Idx++];\r
-      SourceLocation OperatorLoc = ReadSourceLocation(F, Record, Idx);\r
-\r
-      S = MemberExpr::Create(Context, Base, IsArrow, OperatorLoc, QualifierLoc,\r
-                             TemplateKWLoc, MemberD, FoundDecl, MemberNameInfo,\r
-                             HasTemplateKWAndArgsInfo ? &ArgInfo : nullptr, T,\r
-                             VK, OK);\r
-      ReadDeclarationNameLoc(F, cast<MemberExpr>(S)->MemberDNLoc,\r
-                             MemberD->getDeclName(), Record, Idx);\r
-      if (HadMultipleCandidates)\r
+      SourceLocation MemberLoc = ReadSourceLocation(F, Record, Idx);
+      DeclarationNameInfo MemberNameInfo(MemberD->getDeclName(), MemberLoc);
+      bool IsArrow = Record[Idx++];
+      SourceLocation OperatorLoc = ReadSourceLocation(F, Record, Idx);
+
+      S = MemberExpr::Create(Context, Base, IsArrow, OperatorLoc, QualifierLoc,
+                             TemplateKWLoc, MemberD, FoundDecl, MemberNameInfo,
+                             HasTemplateKWAndArgsInfo ? &ArgInfo : nullptr, T,
+                             VK, OK);
+      ReadDeclarationNameLoc(F, cast<MemberExpr>(S)->MemberDNLoc,
+                             MemberD->getDeclName(), Record, Idx);
+      if (HadMultipleCandidates)
         cast<MemberExpr>(S)->setHadMultipleCandidates(true);
       break;
     }

diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp b/clang/lib/Serialization/ASTWriterStmt.cpp
index f15f76c..377b3c7 100644 (file)
--- a/clang/lib/Serialization/ASTWriterStmt.cpp
+++ b/clang/lib/Serialization/ASTWriterStmt.cpp
@@ -550,13 +550,13 @@ void ASTStmtWriter::VisitMemberExpr(MemberExpr *E) {
   Record.push_back(E->getValueKind());
   Record.push_back(E->getObjectKind());
   Writer.AddStmt(E->getBase());
-  Writer.AddDeclRef(E->getMemberDecl(), Record);\r
-  Writer.AddSourceLocation(E->getMemberLoc(), Record);\r
-  Record.push_back(E->isArrow());\r
-  Writer.AddSourceLocation(E->getOperatorLoc(), Record);\r
-  Writer.AddDeclarationNameLoc(E->MemberDNLoc,\r
-                               E->getMemberDecl()->getDeclName(), Record);\r
-  Code = serialization::EXPR_MEMBER;\r
+  Writer.AddDeclRef(E->getMemberDecl(), Record);
+  Writer.AddSourceLocation(E->getMemberLoc(), Record);
+  Record.push_back(E->isArrow());
+  Writer.AddSourceLocation(E->getOperatorLoc(), Record);
+  Writer.AddDeclarationNameLoc(E->MemberDNLoc,
+                               E->getMemberDecl()->getDeclName(), Record);
+  Code = serialization::EXPR_MEMBER;
 }
 
 void ASTStmtWriter::VisitObjCIsaExpr(ObjCIsaExpr *E) {

diff --git a/clang/unittests/AST/SourceLocationTest.cpp b/clang/unittests/AST/SourceLocationTest.cpp
index a3fc953..b0a8f85 100644 (file)
--- a/clang/unittests/AST/SourceLocationTest.cpp
+++ b/clang/unittests/AST/SourceLocationTest.cpp
@@ -106,44 +106,44 @@ TEST(MemberExpr, ImplicitMemberRange) {
   Verifier.expectRange(2, 30, 2, 30);
   EXPECT_TRUE(Verifier.match("struct S { operator int() const; };\n"
                              "int foo(const S& s) { return s; }",
-                             memberExpr()));\r
-}\r
-\r
-class MemberExprArrowLocVerifier : public RangeVerifier<MemberExpr> {\r
+                             memberExpr()));
+}
+
+class MemberExprArrowLocVerifier : public RangeVerifier<MemberExpr> {
 protected:
   SourceRange getRange(const MemberExpr &Node) override {
-     return Node.getOperatorLoc();\r
-  }\r
-};\r
-\r
-TEST(MemberExpr, ArrowRange) {\r
-  MemberExprArrowLocVerifier Verifier;\r
-  Verifier.expectRange(2, 19, 2, 19);\r
-  EXPECT_TRUE(Verifier.match("struct S { int x; };\n"\r
-                             "void foo(S *s) { s->x = 0; }",\r
-                             memberExpr()));\r
-}\r
-\r
-TEST(MemberExpr, MacroArrowRange) {\r
-  MemberExprArrowLocVerifier Verifier;\r
-  Verifier.expectRange(1, 24, 1, 24);\r
-  EXPECT_TRUE(Verifier.match("#define MEMBER(a, b) (a->b)\n"\r
-                             "struct S { int x; };\n"\r
-                             "void foo(S *s) { MEMBER(s, x) = 0; }",\r
-                             memberExpr()));\r
-}\r
-\r
-TEST(MemberExpr, ImplicitArrowRange) {\r
-  MemberExprArrowLocVerifier Verifier;\r
-  Verifier.expectRange(0, 0, 0, 0);\r
-  EXPECT_TRUE(Verifier.match("struct S { int x; void Test(); };\n"\r
-                             "void S::Test() { x = 1; }",\r
-                             memberExpr()));\r
-}\r
-\r
-TEST(VarDecl, VMTypeFixedVarDeclRange) {\r
-  RangeVerifier<VarDecl> Verifier;\r
-  Verifier.expectRange(1, 1, 1, 23);\r
+     return Node.getOperatorLoc();
+  }
+};
+
+TEST(MemberExpr, ArrowRange) {
+  MemberExprArrowLocVerifier Verifier;
+  Verifier.expectRange(2, 19, 2, 19);
+  EXPECT_TRUE(Verifier.match("struct S { int x; };\n"
+                             "void foo(S *s) { s->x = 0; }",
+                             memberExpr()));
+}
+
+TEST(MemberExpr, MacroArrowRange) {
+  MemberExprArrowLocVerifier Verifier;
+  Verifier.expectRange(1, 24, 1, 24);
+  EXPECT_TRUE(Verifier.match("#define MEMBER(a, b) (a->b)\n"
+                             "struct S { int x; };\n"
+                             "void foo(S *s) { MEMBER(s, x) = 0; }",
+                             memberExpr()));
+}
+
+TEST(MemberExpr, ImplicitArrowRange) {
+  MemberExprArrowLocVerifier Verifier;
+  Verifier.expectRange(0, 0, 0, 0);
+  EXPECT_TRUE(Verifier.match("struct S { int x; void Test(); };\n"
+                             "void S::Test() { x = 1; }",
+                             memberExpr()));
+}
+
+TEST(VarDecl, VMTypeFixedVarDeclRange) {
+  RangeVerifier<VarDecl> Verifier;
+  Verifier.expectRange(1, 1, 1, 23);
   EXPECT_TRUE(Verifier.match("int a[(int)(void*)1234];",
                              varDecl(), Lang_C89));
 }