[add assertions for DFuncValue types]

ldc-developers · Sep 25, 2024 · df19079 · df19079
1 parent cd03f54
commit df19079
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/gen/dvalue.cpp b/gen/dvalue.cpp
@@ -108,7 +108,12 @@ LLValue *DSliceValue::getPtr() {
 DFuncValue::DFuncValue(Type *t, FuncDeclaration *fd, LLValue *funcPtr,
                        LLValue *vt, LLValue *vtable)
     : DRValue(t, funcPtr), func(fd), funcPtr(funcPtr), vthis(vt),
-      vtable(vtable) {}
+      vtable(vtable) {
+  const auto tb = t->toBasetype();
+  assert(tb->ty == TY::Tfunction || tb->ty == TY::Tdelegate ||
+         (tb->ty == TY::Tpointer &&
+          tb->nextOf()->toBasetype()->ty == TY::Tfunction));
+}
 
 DFuncValue::DFuncValue(FuncDeclaration *fd, LLValue *funcPtr, LLValue *vt,
                        LLValue *vtable)

diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
@@ -1538,7 +1538,7 @@ DValue *DtoSymbolAddress(const Loc &loc, Type *type, Declaration *decl) {
     // to the module member list.
     DtoDefineFunction(flitdecl);
 
-    return new DFuncValue(flitdecl, DtoCallee(flitdecl, false));
+    return new DFuncValue(type, flitdecl, DtoCallee(flitdecl, false));
   }
 
   if (FuncDeclaration *fdecl = decl->isFuncDeclaration()) {
@@ -1555,7 +1555,7 @@ DValue *DtoSymbolAddress(const Loc &loc, Type *type, Declaration *decl) {
     }
     DtoResolveFunction(fdecl);
     assert(!DtoIsMagicIntrinsic(fdecl));
-    return new DFuncValue(fdecl, DtoCallee(fdecl));
+    return new DFuncValue(type, fdecl, DtoCallee(fdecl));
   }
 
   if (SymbolDeclaration *sdecl = decl->isSymbolDeclaration()) {

diff --git a/gen/toir.cpp b/gen/toir.cpp
@@ -1086,7 +1086,7 @@ class ToElemVisitor : public Visitor {
       assert(funcPtr);
 
       LLValue *vthis = (DtoIsInMemoryOnly(l->type) ? DtoLVal(l) : DtoRVal(l));
-      result = new DFuncValue(fdecl, funcPtr, vthis, vtable);
+      result = new DFuncValue(e->type, fdecl, funcPtr, vthis, vtable);
     } else {
       llvm_unreachable("Unknown target for VarDeclaration.");
     }