From 05de8d86370d7a329bdf4cb4b9e5b270f6696076 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Sat, 8 Oct 2022 16:46:18 -0400 Subject: Fix for issue with user attribute lookup (#2437) * #include an absolute path didn't work - because paths were taken to always be relative. * Add handling for root paths. * Fixes around absolute paths. * Add SimplifyStyle * Remove unrequire include. * Fix some details around RelativeFileSystem canonical paths. * For MemoryFileSystem make sure "/a" and "a" maps to same canonical path. * Add test for canonicalPath. * Improve comment. * More testing around canonical paths. * Fix for user attribute lookup issue. * Add a test. * Small improvements in test. * Improve the comments around lookup workaround. --- source/slang/slang-check-modifier.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source/slang/slang-check-modifier.cpp') diff --git a/source/slang/slang-check-modifier.cpp b/source/slang/slang-check-modifier.cpp index a7fb641a2..a2b411c22 100644 --- a/source/slang/slang-check-modifier.cpp +++ b/source/slang/slang-check-modifier.cpp @@ -226,6 +226,19 @@ namespace Slang attrDecl->parentDecl = parentDecl; parentDecl->members.add(attrDecl); + SLANG_ASSERT(!parentDecl->isMemberDictionaryValid()); + + // TODO(JS): A bit of a work around(!) + // + // To get to this point we must have already have performed a lookup for attributeName, + // and it failed. That lookup used the TypeCheckingCache, and + // so we know there is a cache entry that will be *wrong*, now we have created and + // added the AttributeDecl with the attributeName. + // + // To work around, we remove all cached lookups around the name, such that when a subsequent + // lookup is made, the cache will not return the old (wrong) result. + removeLookupForName(getLinkage()->getTypeCheckingCache(), attributeName); + // Finally, we perform any required semantic checks on // the newly constructed attribute decl. // -- cgit v1.2.3