[RISCV][GlobalISel] Select and expand global addresses

2 files changed, 10 insertions, 1 deletions

diff --git a/backend/lib/CodeGen/MIRParser/MIParser.cpp b/backend/lib/CodeGen/MIRParser/MIParser.cpp
index 62f1f14..b44701b 100644
--- a/backend/lib/CodeGen/MIRParser/MIParser.cpp
+++ b/backend/lib/CodeGen/MIRParser/MIParser.cpp
@@ -2290,7 +2290,10 @@ bool MIParser::Impl::parseOperand(bool IsDef, ParsedOperand &Result) {
     std::int64_t Offset = 0;
     if (parseOptionalOffset(Offset))
       return true;
-    auto Created = MachineOperand::globalSymbol(Name, Offset, TargetFlags);
+    const GlobalValueProperties Properties = Context.GlobalValuePropertiesForName
+                                                 ? Context.GlobalValuePropertiesForName(Name)
+                                                 : GlobalValueProperties{};
+    auto Created = MachineOperand::globalSymbol(Name, Offset, TargetFlags, Properties);
     if (!Created)
       return importError(OperandToken, Created.error());
     Operand = std::move(*Created);
diff --git a/backend/lib/CodeGen/MIRParser/MIRParser.cpp b/backend/lib/CodeGen/MIRParser/MIRParser.cpp
index 3b89491..c7e92a0 100644
--- a/backend/lib/CodeGen/MIRParser/MIRParser.cpp
+++ b/backend/lib/CodeGen/MIRParser/MIRParser.cpp
@@ -290,6 +290,12 @@ bool MIRDocumentParser::parseFunction(const yaml::Node &Root, MIRDocument &Docum
       return IRFunction->block(BlockName) != nullptr;
     };
   }
+  if (Document.EmbeddedIR) {
+    const EmbeddedIRReferenceIndex *Embedded = &*Document.EmbeddedIR;
+    Context.GlobalValuePropertiesForName = [Embedded](std::string_view GlobalName) {
+      return Embedded->globalObjectProperties(GlobalName).value_or(GlobalValueProperties{});
+    };
+  }
 
   std::vector<PendingJumpTable> PendingJumpTables;
   if (parseFunctionScalars(Root, Function, DocumentInfo) ||