[PATCH] D153760: [YAMLParser] Support block nodes when parsing YAML strings.

[Zain Jaffal via Phabricator via llvm-commits]

zjaffal created this revision.
zjaffal added reviewers: fhahn, thegameg.
Herald added subscribers: StephenFan, hiraditya.
Herald added a project: All.
zjaffal requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Previously if a string is in the format

  |
        val
        val2
        val3

Yaml parser will error out without parsing the string. The mentioned pattern is a valid yaml str and should be parsed.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D153760

Files:
  llvm/lib/Remarks/YAMLRemarkParser.cpp
  llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp


Index: llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
===================================================================
--- llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
+++ llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp
@@ -154,6 +154,16 @@
             "  - String: ' because its definition is unavailable'\n"
             "Pass: inline\n"
             "");
+
+  // Block Remark.
+  parseGood("\n"
+            "--- !Missed\n"
+            "Function: foo\n"
+            "Name: NoDefinition\n"
+            "Args:\n"
+            "  - String:           |\n      \n      \n      blocks\n"
+            "Pass: inline\n"
+            "");
 }
 
 // Mandatory common part of a remark.
Index: llvm/lib/Remarks/YAMLRemarkParser.cpp
===================================================================
--- llvm/lib/Remarks/YAMLRemarkParser.cpp
+++ llvm/lib/Remarks/YAMLRemarkParser.cpp
@@ -293,9 +293,16 @@
 
 Expected<StringRef> YAMLRemarkParser::parseStr(yaml::KeyValueNode &Node) {
   auto *Value = dyn_cast<yaml::ScalarNode>(Node.getValue());
-  if (!Value)
-    return error("expected a value of scalar type.", Node);
-  StringRef Result = Value->getRawValue();
+  yaml::BlockScalarNode *ValueBlock;
+  StringRef Result;
+  if (!Value) {
+    // Try to parse the value as a block node.
+    ValueBlock = dyn_cast<yaml::BlockScalarNode>(Node.getValue());
+    if (!ValueBlock)
+      return error("expected a value of scalar type.", Node);
+    Result = ValueBlock->getValue();
+  } else
+    Result = Value->getRawValue();
 
   if (Result.front() == '\'')
     Result = Result.drop_front();
@@ -429,9 +436,16 @@
 
 Expected<StringRef> YAMLStrTabRemarkParser::parseStr(yaml::KeyValueNode &Node) {
   auto *Value = dyn_cast<yaml::ScalarNode>(Node.getValue());
-  if (!Value)
-    return error("expected a value of scalar type.", Node);
+  yaml::BlockScalarNode *ValueBlock;
   StringRef Result;
+  if (!Value) {
+    // Try to parse the value as a block node.
+    ValueBlock = dyn_cast<yaml::BlockScalarNode>(Node.getValue());
+    if (!ValueBlock)
+      return error("expected a value of scalar type.", Node);
+    Result = ValueBlock->getValue();
+  } else
+    Result = Value->getRawValue();
   // If we have a string table, parse it as an unsigned.
   unsigned StrID = 0;
   if (Expected<unsigned> MaybeStrID = parseUnsigned(Node))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153760.534509.patch
Type: text/x-patch
Size: 2346 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230626/0c1e8185/attachment.bin>