1 files changed, 12 insertions, 2 deletions
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
index 83b668a33..95d5a2a7c 100644
--- a/source/slang/slang-check-expr.cpp
+++ b/source/slang/slang-check-expr.cpp
@@ -4099,6 +4099,15 @@ Expr* SemanticsVisitor::maybeDereference(Expr* inExpr, CheckBaseContext checkBas
             elementType = QualType(ptrType->getValueType());
             elementType.isLeftValue = true;
         }
+        else
+        {
+            auto newExpr = maybeOpenRef(expr);
+            if (newExpr != expr)
+            {
+                expr = newExpr;
+                continue;
+            }
+        }
         if (elementType.type)
         {
             auto derefExpr = m_astBuilder->create<DerefExpr>();
@@ -4108,9 +4117,10 @@ Expr* SemanticsVisitor::maybeDereference(Expr* inExpr, CheckBaseContext checkBas
             expr = derefExpr;
             continue;
         }
-        // Default case: just use the expression as-is
-        return expr;
+        break;
     }
+    // Default case: just use the expression as-is
+    return expr;
 }
 
 Expr* SemanticsVisitor::CheckMatrixSwizzleExpr(