Merge pull request #61555 from artemcm/SanitizeProtocolListForConstExtraction

[Compile Time Constant Extraction] Allow quoted protocol names insideargument list to '-const-gather-protocols-file'

Author: artemcm

lib/ConstExtract/ConstExtract.cpp

@@ -98,7 +98,10 @@ parseProtocolListFromFile(StringRef protocolListFilePath,
           ParseFailed = true;
           break;
         }
-        protocols.insert(ScalarNode->getRawValue().str());
+        auto protocolNameStr = ScalarNode->getRawValue().str();
+        if (protocolNameStr.front() == '"' && protocolNameStr.back() == '"')
+          protocolNameStr = protocolNameStr.substr(1, protocolNameStr.size() - 2);
+        protocols.insert(protocolNameStr);
       }
     } else
       ParseFailed = true;

test/Frontend/emit-const-values-file.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: echo 'print("Hello, World!")' > %t/main.swift
-// RUN: echo "[Foo]" > %t/protocols.json
+// RUN: echo "["Foo"]" > %t/protocols.json
 // RUN: cd %t
 
 // RUN: %target-swift-frontend -typecheck -const-gather-protocols-file %t/protocols.json -emit-const-values-path %t/main.swiftconstvalues -primary-file %t/main.swift