Export foreign pointers properly.

asoffer · Dec 28, 2023 · 3488318 · 3488318
1 parent fa21944
commit 3488318
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ir/deserialize.cc b/ir/deserialize.cc
@@ -148,6 +148,10 @@ bool Deserializer::Deserialize(ModuleProto const& proto, ModuleId id,
 
       value.push_back(
           &global_function_registry.function(FunctionId(mid, local_fn_id)));
+    } else if (t.kind() == type::Type::Kind::Pointer) {
+      if (exported_symbol.content().size() != 1) { return false; }
+      uint64_t n    = exported_symbol.content()[0];
+      value.push_back(global_pointer_registry.pointer(n));
     } else {
       for (uint64_t n : exported_symbol.content()) {
         jasmin::Value v = jasmin::Value::Uninitialized();

diff --git a/ir/serialize.cc b/ir/serialize.cc
@@ -88,6 +88,8 @@ void Serializer::Serialize(Module& module, ModuleProto& proto) {
       if (entry.qualified_type.type().kind() == type::Type::Kind::Function) {
         raw_value =
             global_function_registry.id(v.as<IrFunction const*>()).value();
+      } else if (entry.qualified_type.type().kind() == type::Type::Kind::Pointer) {
+        raw_value = global_pointer_registry.id(v.as<void*>());
       } else {
         raw_value = v.raw_value();
       }