1 files changed, 8 insertions, 4 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index e12f97640..f4a1de3d5 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -517,7 +517,8 @@ namespace Slang
         return ConstructDeclRefExpr(
             innerDeclRef,
             base,
-            originalExpr->loc);
+            originalExpr->loc,
+            originalExpr);
     }
 
     Expr* SemanticsVisitor::CompleteOverloadCandidate(
@@ -556,8 +557,12 @@ namespace Slang
             goto error;
 
         {
+            auto originalAppExpr = as<AppExprBase>(context.originalExpr);
             auto baseExpr = ConstructLookupResultExpr(
-                candidate.item, context.baseExpr, context.funcLoc);
+                candidate.item,
+                context.baseExpr,
+                context.funcLoc,
+                originalAppExpr ? originalAppExpr->functionExpr : nullptr);
 
             switch(candidate.flavor)
             {
@@ -568,12 +573,11 @@ namespace Slang
                     {
                         callExpr = m_astBuilder->create<InvokeExpr>();
                         callExpr->loc = context.loc;
-
                         for(Index aa = 0; aa < context.argCount; ++aa)
                             callExpr->arguments.add(context.getArg(aa));
                     }
 
-
+                    callExpr->originalFunctionExpr = callExpr->functionExpr;
                     callExpr->functionExpr = baseExpr;
                     callExpr->type = QualType(candidate.resultType);