[index] Use ',' to separate symbol roles when printing.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@262205 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Index/IndexSymbol.cpp b/lib/Index/IndexSymbol.cpp
index 010ccd42a4a184a9ef3a9c9eb92cccae4e6c842f..96da7a7989cdd5d9c0c469e8942b9bbcd11d4594 100644 (file)
--- a/lib/Index/IndexSymbol.cpp
+++ b/lib/Index/IndexSymbol.cpp
@@ -214,7 +214,7 @@ void index::printSymbolRoles(SymbolRoleSet Roles, raw_ostream &OS) {
   bool VisitedOnce = false;
   applyForEachSymbolRole(Roles, [&](SymbolRole Role) {
     if (VisitedOnce)
-      OS << '/';
+      OS << ',';
     else
       VisitedOnce = true;
     switch (Role) {

diff --git a/test/Index/Core/index-source.cpp b/test/Index/Core/index-source.cpp
index 754464682660ca9525de60c7dd7eae93023d1049..406f70f3896c146d911e55d1b1b0d3c7845f3ce4 100644 (file)
--- a/test/Index/Core/index-source.cpp
+++ b/test/Index/Core/index-source.cpp
@@ -4,6 +4,6 @@ template <typename TemplArg>
 class TemplCls {
 // CHECK: [[@LINE-1]]:7 | c++-class/C++ | TemplCls | c:@ST>1#T@TemplCls | <no-cgname> | Def | rel: 0
   TemplCls(int x);
-  // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | <no-cgname> | Decl/RelChild | rel: 1
+  // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | <no-cgname> | Decl,RelChild | rel: 1
   // CHECK-NEXT: RelChild | TemplCls | c:@ST>1#T@TemplCls
 };

diff --git a/test/Index/Core/index-source.m b/test/Index/Core/index-source.m
index 0fdae7ae5f9a0bb9a1f971d025efbb0349b9ec36..6bff76ed27c0ebfe6e0dcd172e7c0f4cc989d61d 100644 (file)
--- a/test/Index/Core/index-source.m
+++ b/test/Index/Core/index-source.m
@@ -3,6 +3,6 @@
 @interface Base
 // CHECK: [[@LINE-1]]:12 | objc-class/ObjC | Base | c:objc(cs)Base | _OBJC_CLASS_$_Base | Decl | rel: 0
 -(void)meth;
-// CHECK: [[@LINE-1]]:1 | objc-instance-method/ObjC | meth | c:objc(cs)Base(im)meth | -[Base meth] | Decl/Dyn/RelChild | rel: 1
+// CHECK: [[@LINE-1]]:1 | objc-instance-method/ObjC | meth | c:objc(cs)Base(im)meth | -[Base meth] | Decl,Dyn,RelChild | rel: 1
 // CHECK-NEXT: RelChild | Base | c:objc(cs)Base
 @end