From 389be08822ba554327b5948266f54acf8a312fe7 Mon Sep 17 00:00:00 2001
From: Yong He <yhe@nvidia.com>
Date: Fri, 5 Jun 2020 12:57:57 -0700
Subject: Fix FindTypeByName reflection API not finding stdlib types.

---
 source/slang/slang-check-shader.cpp              |  2 +-
 tools/slang-test/slang-test.vcxproj              |  1 +
 tools/slang-test/slang-test.vcxproj.filters      |  3 ++
 tools/slang-test/test-reporter.h                 |  8 +++-
 tools/slang-test/unit-test-find-type-by-name.cpp | 56 ++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 tools/slang-test/unit-test-find-type-by-name.cpp

diff --git a/source/slang/slang-check-shader.cpp b/source/slang/slang-check-shader.cpp
index 80860074d..69dbf133d 100644
--- a/source/slang/slang-check-shader.cpp
+++ b/source/slang/slang-check-shader.cpp
@@ -1290,7 +1290,7 @@ namespace Slang
         // it defines keywords like `true` and `false`).
         //
         RefPtr<Scope> scope = new Scope();
-        scope->parent = getLinkage()->getSessionImpl()->baseLanguageScope;
+        scope->parent = getLinkage()->getSessionImpl()->slangLanguageScope;
         //
         // Next, the scope needs to include all of the
         // modules in the program as peers, as if they
diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj
index a7e925ffd..bf79af2f1 100644
--- a/tools/slang-test/slang-test.vcxproj
+++ b/tools/slang-test/slang-test.vcxproj
@@ -177,6 +177,7 @@
     <ClCompile Include="test-reporter.cpp" />
     <ClCompile Include="unit-offset-container.cpp" />
     <ClCompile Include="unit-test-byte-encode.cpp" />
+    <ClCompile Include="unit-test-find-type-by-name.cpp" />
     <ClCompile Include="unit-test-free-list.cpp" />
     <ClCompile Include="unit-test-memory-arena.cpp" />
     <ClCompile Include="unit-test-path.cpp" />
diff --git a/tools/slang-test/slang-test.vcxproj.filters b/tools/slang-test/slang-test.vcxproj.filters
index afb5b091a..27477f268 100644
--- a/tools/slang-test/slang-test.vcxproj.filters
+++ b/tools/slang-test/slang-test.vcxproj.filters
@@ -65,5 +65,8 @@
     <ClCompile Include="unit-test-string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="unit-test-find-type-by-name.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tools/slang-test/test-reporter.h b/tools/slang-test/test-reporter.h
index cb4d5e985..6a862afef 100644
--- a/tools/slang-test/test-reporter.h
+++ b/tools/slang-test/test-reporter.h
@@ -9,7 +9,13 @@
 #include "../../source/core/slang-dictionary.h"
 
 
-#define SLANG_CHECK(x) TestReporter::get()->addResultWithLocation((x), #x, __FILE__, __LINE__); 
+#define SLANG_CHECK(x) TestReporter::get()->addResultWithLocation((x), #x, __FILE__, __LINE__);
+#define SLANG_CHECK_ABORT(x)                                                                     \
+    {                                                                                            \
+        bool _slang_check_result = (x);                                                          \
+        TestReporter::get()->addResultWithLocation(_slang_check_result, #x, __FILE__, __LINE__); \
+        if (!_slang_check_result) return;                                                        \
+    }
 
 struct TestRegister
 {
diff --git a/tools/slang-test/unit-test-find-type-by-name.cpp b/tools/slang-test/unit-test-find-type-by-name.cpp
new file mode 100644
index 000000000..ebe5f746b
--- /dev/null
+++ b/tools/slang-test/unit-test-find-type-by-name.cpp
@@ -0,0 +1,56 @@
+// unit-test-byte-encode.cpp
+
+#include "../../slang.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test-context.h"
+
+using namespace Slang;
+
+static void findTypeByNameTest()
+{
+    const char* testSource =
+        "struct TestStruct {"
+        "   int member0;"
+        "   Texture2D texture1;"
+        "};";
+    auto session = spCreateSession();
+    auto request = spCreateCompileRequest(session);
+    spAddCodeGenTarget(request, SLANG_DXBC);
+    int tuIndex = spAddTranslationUnit(request, SLANG_SOURCE_LANGUAGE_SLANG, "tu1");
+    spAddTranslationUnitSourceString(request, tuIndex, "internalFile", testSource);
+    spCompile(request);
+
+    auto testBody = [&]()
+    {
+        auto reflection = slang::ShaderReflection::get(request);
+        auto testStruct = reflection->findTypeByName("TestStruct");
+        SLANG_CHECK_ABORT(testStruct->getFieldCount() == 2);
+        auto field0Name = testStruct->getFieldByIndex(0)->getName();
+        SLANG_CHECK_ABORT(field0Name != nullptr && strcmp(field0Name, "member0") == 0);
+        auto field1Name = testStruct->getFieldByIndex(1)->getName();
+        SLANG_CHECK_ABORT(field1Name != nullptr && strcmp(field1Name, "texture1") == 0);
+
+        auto intType = reflection->findTypeByName("int");
+        auto intTypeName = intType->getName();
+        SLANG_CHECK_ABORT(intTypeName && strcmp(intTypeName, "int") == 0);
+
+        auto paramBlockType = reflection->findTypeByName("ParameterBlock<TestStruct>");
+        SLANG_CHECK_ABORT(paramBlockType != nullptr);
+        auto paramBlockTypeName = paramBlockType->getName();
+        SLANG_CHECK_ABORT(paramBlockTypeName && strcmp(paramBlockTypeName, "ParameterBlock") == 0);
+        auto paramBlockElementType = paramBlockType->getElementType();
+        SLANG_CHECK_ABORT(paramBlockElementType != nullptr);
+        auto paramBlockElementTypeName = paramBlockElementType->getName();
+        SLANG_CHECK_ABORT(paramBlockElementTypeName && strcmp(paramBlockElementTypeName, "TestStruct") == 0);
+    };
+
+    testBody();
+
+    spDestroyCompileRequest(request);
+    spDestroySession(session);
+}
+
+SLANG_UNIT_TEST("findTypeByName", findTypeByNameTest);
-- 
cgit v1.2.3