summaryrefslogtreecommitdiffstats
path: root/source/slang/lookup.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-12-12 08:57:48 -0500
committerGitHub <noreply@github.com>2018-12-12 08:57:48 -0500
commit49ed6b60d662906f290578f802f80b0ead1a2b9d (patch)
treee47050f6508a4b3a4d38b756e9b3c53e0d159507 /source/slang/lookup.cpp
parent62d3e387774255be4d507cca045ac97dabac9970 (diff)
Running tests in slang-test process (#740)
* First pass at having an interface to write text to that can be replaced. Simplifed and made more rigerous the interface used to write formatted strings. * Added AppContext to simplify setting up and parsing around of streams. * Added more simplified way to get the std error/out from AppContext. * Work in progress using dll for tools to speed up testing. * First pass at ISlangWriter interface. * Added support for writing VaArgs. Added NullWriter. * Use ISlangWriter for output. * Use ISlangWriter for output - replacing OutputCallback. Make IRDump go to ISlangWriter * SlangWriterTargetType -> SlangWriterChannel Improvements around AppContext * Shared library working with slang-reflection-test. * Dll testing working for render-test. * Include va_list definintion from header. * Fix errors from clang. * Fix typo for linux. * Added -usexes option * Fix typo. * Fix arguments problem on linux. * Fix typo for linux. * Add windows tool shared library projects. * Fix warning from x86 win build. Fix signed warning from slang-test/main.cpp * First attempt at getting premake to work on travis, and run tests. * Try moving build out into script. * Invoke bash scripts so they don't have to be executable. * Drive configuration/tests from env parameters set by travis * Try using source to run travis tests. * Remove the build.linux directory - but doing so will overwrite Makefile. * Made -fno-delete-null-pointer-checks gcc only. * Try to fix warning from -fno-delete-null-pointer-checks * Turn of warnings for unknown switches. * Try to make premake choose the correct tooling. * Disabled missing braces warning. * Disable -Wundefined-var-template on clang. * -Wunused-function disabled for clang. * Fix typo due to SlangBool. * Remove this nullptr tests. * "-Wno-unused-private-field" for clang. * Added "-Wno-undefined-bool-conversion" * Add DominatorList::end fix. * Split scripts into travis_build.sh travis_test.sh * Fix gcc/clang template pre-declaration issue around QualType. * Fix premake to build such that pthread correctly links with slang-glslang
Diffstat (limited to 'source/slang/lookup.cpp')
-rw-r--r--source/slang/lookup.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/slang/lookup.cpp b/source/slang/lookup.cpp
index e4ae3c8bb..f74e11016 100644
--- a/source/slang/lookup.cpp
+++ b/source/slang/lookup.cpp
@@ -177,6 +177,11 @@ void DoMemberLookupImpl(
LookupResult& ioResult,
BreadcrumbInfo* breadcrumbs)
{
+ if (!baseType)
+ {
+ return;
+ }
+
// If the type was pointer-like, then dereference it
// automatically here.
if (auto pointerLikeType = baseType->As<PointerLikeType>())
@@ -482,11 +487,14 @@ void DoLookupImpl(
// in the target decl we are extending
if (auto extDeclRef = containerDeclRef.As<ExtensionDecl>())
{
- if (auto targetDeclRef = extDeclRef.getDecl()->targetType->AsDeclRefType())
+ if (extDeclRef.getDecl()->targetType)
{
- if (auto aggDeclRef = targetDeclRef->declRef.As<AggTypeDecl>())
+ if (auto targetDeclRef = extDeclRef.getDecl()->targetType->AsDeclRefType())
{
- containerDeclRef = extDeclRef.Substitute(aggDeclRef);
+ if (auto aggDeclRef = targetDeclRef->declRef.As<AggTypeDecl>())
+ {
+ containerDeclRef = extDeclRef.Substitute(aggDeclRef);
+ }
}
}
}
@@ -703,4 +711,4 @@ LookupResult lookUpMember(
return result;
}
-} \ No newline at end of file
+}