From 79e92395f8ce3d92c446e3bb3250d19ce33decd5 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 16 Apr 2021 10:34:26 -0700
Subject: Update `model-viewer` example and fixing compiler bugs. (#1795)

---
 source/slang/slang-ir-lower-generic-function.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source/slang/slang-ir-lower-generic-function.cpp')

diff --git a/source/slang/slang-ir-lower-generic-function.cpp b/source/slang/slang-ir-lower-generic-function.cpp
index 6e9754744..8cd292e49 100644
--- a/source/slang/slang-ir-lower-generic-function.cpp
+++ b/source/slang/slang-ir-lower-generic-function.cpp
@@ -26,6 +26,7 @@ namespace Slang
                 return genericValue;
             auto genericParent = as<IRGeneric>(genericValue);
             SLANG_ASSERT(genericParent);
+            SLANG_ASSERT(genericParent->getDataType());
             auto func = as<IRFunc>(findGenericReturnVal(genericParent));
             if (!func)
             {
@@ -37,7 +38,8 @@ namespace Slang
                 return genericValue;
             }
             SLANG_ASSERT(func);
-            if (!func->isDefinition())
+            // Do not lower intrinsic functions.
+            if (!func->isDefinition() || func->findDecoration<IRTargetIntrinsicDecoration>())
             {
                 sharedContext->loweredGenericFunctions[genericValue] = genericValue;
                 return genericValue;
@@ -47,7 +49,10 @@ namespace Slang
             builder.sharedBuilder = &sharedContext->sharedBuilderStorage;
             builder.setInsertBefore(genericParent);
             auto loweredFunc = cast<IRFunc>(cloneInstAndOperands(&cloneEnv, &builder, func));
-            loweredFunc->setFullType(lowerGenericFuncType(&builder, cast<IRGeneric>(genericParent->getFullType())));
+            auto loweredGenericType =
+                lowerGenericFuncType(&builder, cast<IRGeneric>(genericParent->getFullType()));
+            SLANG_ASSERT(loweredGenericType);
+            loweredFunc->setFullType(loweredGenericType);
             List<IRInst*> clonedParams;
 
             for (auto genericChild : genericParent->getFirstBlock()->getChildren())
-- 
cgit v1.2.3