Fix a bug in import handling (shader-slang#394)

Tim Foley · web-flow · commit 652a3c987d2b · 2018-02-01T14:41:34.000-08:00
The recent change that removed `#import` accidentally introduced a regression that made *any* code that imports the same module in more than one place fail.

I'm just fixing the bug for now to unblock users, but this should really get a regression test.
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
@@ -575,7 +575,10 @@ RefPtr<ModuleDecl> CompileRequest::findOrImportModule(
         {
             // We seem to be in the middle of loading this module
             mSink.diagnose(loc, Diagnostics::recursiveModuleImport, name);
+            return nullptr;
         }
+
+        return loadedModule->moduleDecl;
     }
 
     // Derive a file name for the module, by taking the given

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,10 @@ RefPtr<ModuleDecl> CompileRequest::findOrImportModule(`
`575`	`575`	`{`
`576`	`576`	`// We seem to be in the middle of loading this module`
`577`	`577`	`mSink.diagnose(loc, Diagnostics::recursiveModuleImport, name);`
	`578`	`+ return nullptr;`
`578`	`579`	`}`
	`580`	`+`
	`581`	`+ return loadedModule->moduleDecl;`
`579`	`582`	`}`
`580`	`583`
`581`	`584`	`// Derive a file name for the module, by taking the given`