summaryrefslogtreecommitdiffstats
path: root/source/slang/lower-to-ir.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2019-01-23 09:13:03 -0800
committerGitHub <noreply@github.com>2019-01-23 09:13:03 -0800
commit935b629448fedc187243bfe88d4149bf30d89c05 (patch)
treef950122a3155df9964a297eec52776452e40e04d /source/slang/lower-to-ir.cpp
parenta08a3140716b89146bf0a22dc014c5470e90e910 (diff)
Fix IR emit logic for methods in `struct` types (#791)
There was a bug in the logic for emitting initial IR, such that it was neglecting to emit "methods" (member functions) unless they were also referenced by a non-member (global) function, or were needed to satisfy an interface requirement. This would only matter for `import`ed modules, since for non-`import`ed code, anything relevant would be referenced by the entry point so that the problem would never surface. This change fixes the underlying problem by adding a step to the IR lowering pass called `ensureAllDeclsRec` that makes sure that not only global-scope declarations, but also anything nested under a `struct` type gets emitted to the initial IR module. There are also a few unrelated fixes in this PR, which are things I ran into while making the fix: * Deleted support for the (long gone) `IRDeclRef` type in our `slang.natvis` file * Added support for visualizing the value of IR string and integer literals when they appear in the debugger * Fixed IR dumping logic to not skip emitting `struct` and `interface` instructions. Switching those to inherit from `IRType` accidentally affected how they get printed in IR dumps by default. * Fixed up the IR linking logic so that it correctly takes `[export]` decorations into account, so that an exported definition will always be taken over any other (unless the latter is more specialized for the target). I initially implemented this in an attempt to fix the original issue, but found it wasn't a fix for the root cause. It is still a better approach than what was implemented previously, so I'm leaving it in place.
Diffstat (limited to 'source/slang/lower-to-ir.cpp')
-rw-r--r--source/slang/lower-to-ir.cpp39
1 files changed, 32 insertions, 7 deletions
diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp
index 082f16b22..c1fa871ba 100644
--- a/source/slang/lower-to-ir.cpp
+++ b/source/slang/lower-to-ir.cpp
@@ -4922,7 +4922,6 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
IRStructType* irStruct = subBuilder->createStructType();
addNameHint(context, irStruct, decl);
-
addLinkageDecoration(context, irStruct, decl);
subBuilder->setInsertInto(irStruct);
@@ -4959,15 +4958,16 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
fieldType);
}
- // TODO: we should enumerate the non-field members of the type
- // as well, and ensure those have been emitted (e.g., any
- // member functions).
+ // There may be members not handled by the above logic (e.g.,
+ // member functions), but we will not immediately force them
+ // to be emitted here, so as not to risk a circular dependency.
+ //
+ // Instead we will force emission of all children of aggregate
+ // type declarations later, from the top-level emit logic.
irStruct->moveToEnd();
-
addTargetIntrinsicDecorations(irStruct, decl);
-
return LoweredValInfo::simple(finishOuterGenerics(subBuilder, irStruct));
}
@@ -6147,6 +6147,31 @@ static void lowerEntryPointToIR(
}
}
+ /// Ensure that `decl` and all relevant declarations under it get emitted.
+static void ensureAllDeclsRec(
+ IRGenContext* context,
+ Decl* decl)
+{
+ ensureDecl(context, decl);
+
+ // Note: We are checking here for aggregate type declarations, and
+ // not for `ContainerDecl`s in general. This is because many kinds
+ // of container declarations will already take responsibility for emitting
+ // their children directly (e.g., a function declaration is responsible
+ // for emitting its own parameters).
+ //
+ // Aggregate types are the main case where we can emit an outer declaration
+ // and not the stuff nested inside of it.
+ //
+ if(auto containerDecl = dynamic_cast<AggTypeDecl*>(decl))
+ {
+ for (auto memberDecl : containerDecl->Members)
+ {
+ ensureAllDeclsRec(context, memberDecl);
+ }
+ }
+}
+
IRModule* generateIRForTranslationUnit(
TranslationUnitRequest* translationUnit)
{
@@ -6192,7 +6217,7 @@ IRModule* generateIRForTranslationUnit(
// been emitted.
for (auto decl : translationUnit->SyntaxNode->Members)
{
- ensureDecl(context, decl);
+ ensureAllDeclsRec(context, decl);
}
#if 0