[MIR] Accept empty optional register fields

2 files changed, 17 insertions, 7 deletions

diff --git a/backend/lib/MIR/MIRFrameParser.cpp b/backend/lib/MIR/MIRFrameParser.cpp
index 9e21dfc..176bf25 100644
--- a/backend/lib/MIR/MIRFrameParser.cpp
+++ b/backend/lib/MIR/MIRFrameParser.cpp
@@ -168,10 +168,15 @@ bool MIRDocumentParser::parseStackObjects(const yaml::Node &Root, MachineFunctio
           return true;
       }
       if (const yaml::Node *SavedNode = mappingValue(*Element, "callee-saved-register")) {
-        PhysicalRegister Reg;
-        if (physicalRegister(*SavedNode, Reg))
+        std::string_view SavedName;
+        if (scalar(*SavedNode, SavedName, "physical register"))
           return true;
-        Description.CalleeSavedRegister = Reg;
+        if (!trim(SavedName).empty()) {
+          PhysicalRegister Reg;
+          if (physicalRegister(SavedName, SavedNode->range(), Reg))
+            return true;
+          Description.CalleeSavedRegister = Reg;
+        }
       }
       if (const yaml::Node *RestoredNode = mappingValue(*Element, "callee-saved-restored")) {
         if (boolean(*RestoredNode, Description.CalleeSavedRestored))
diff --git a/backend/lib/MIR/MIRFunctionParser.cpp b/backend/lib/MIR/MIRFunctionParser.cpp
index a59e4bd..68bc0aa 100644
--- a/backend/lib/MIR/MIRFunctionParser.cpp
+++ b/backend/lib/MIR/MIRFunctionParser.cpp
@@ -285,12 +285,17 @@ bool MIRDocumentParser::parseRegisters(const yaml::Node &Root, MachineFunction &
       }
 
       if (const yaml::Node *Preferred = mappingValue(*Element, "preferred-register")) {
+        std::string_view PreferredName;
         PhysicalRegister Reg;
-        if (physicalRegister(*Preferred, Reg))
+        if (scalar(*Preferred, PreferredName, "physical register"))
           return true;
-        auto AddResult = Function.registerInfo().addAllocationHint(*Created, Reg);
-        if (!AddResult)
-          return importError(Preferred->range(), AddResult.error());
+        if (!trim(PreferredName).empty()) {
+          if (physicalRegister(PreferredName, Preferred->range(), Reg))
+            return true;
+          auto AddResult = Function.registerInfo().addAllocationHint(*Created, Reg);
+          if (!AddResult)
+            return importError(Preferred->range(), AddResult.error());
+        }
       }
       if (const yaml::Node *Flags = mappingValue(*Element, "flags")) {
         if (requireKind(*Flags, yaml::NodeKind::Sequence, "virtual-register flags"))