4 files changed, 59 insertions, 17 deletions
diff --git a/source/slang/ir-link.cpp b/source/slang/ir-link.cpp
index 231ee81d2..610658d51 100644
--- a/source/slang/ir-link.cpp
+++ b/source/slang/ir-link.cpp
@@ -855,7 +855,15 @@ bool isBetterForTarget(
     if(newLevel != oldLevel)
         return UInt(newLevel) > UInt(oldLevel);
 
-    // All other factors being equal, a definition is
+    // All preceding factors being equal, an `[export]` is better
+    // than an `[import]`.
+    //
+    bool newIsExport = newVal->findDecoration<IRExportDecoration>() != nullptr;
+    bool oldIsExport = oldVal->findDecoration<IRExportDecoration>() != nullptr;
+    if(newIsExport != oldIsExport)
+        return newIsExport;
+
+    // All preceding factors being equal, a definition is
     // better than a declaration.
     auto newIsDef = isDefinition(newVal);
     auto oldIsDef = isDefinition(oldVal);
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 8f33034b7..a284e846e 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -3118,6 +3118,22 @@ namespace Slang
         if(as<IRConstant>(inst))
             return true;
 
+        // We are going to have a general rule that
+        // a type should be folded into its use site,
+        // which improves output in most cases, but
+        // we would like to not apply that rule to
+        // "nominal" types like `struct`s.
+        //
+        switch( inst->op )
+        {
+        case kIROp_StructType:
+        case kIROp_InterfaceType:
+            return false;
+
+        default:
+            break;
+        }
+
         if(as<IRType>(inst))
             return true;
 
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
diff --git a/source/slang/slang.natvis b/source/slang/slang.natvis
index 6565f5a7a..f19ed925b 100644
--- a/source/slang/slang.natvis
+++ b/source/slang/slang.natvis
@@ -82,6 +82,8 @@
     <Expand>
       <Item Name="[op]">op</Item>
       <Item Name="[type]">typeUse.usedValue</Item>
+      <Item Name="[value]" Condition="op == Slang::kIROp_StringLit">((IRStringLit*)this)->value.stringVal.chars,[((IRStringLit*)this)->value.stringVal.numChars]s8</Item>
+      <Item Name="[value]" Condition="op == Slang::kIROp_IntLit">((IRIntLit*)this)->value.intVal</Item>
       <Synthetic Name="[operands]">
         <DisplayString>{{count = {operandCount}}}</DisplayString>
         <Expand>
@@ -113,15 +115,6 @@
       </Synthetic>
   </Expand>
   </Type>
-  <Type Name="Slang::IRDeclRef">
-    <DisplayString>{{IRDeclRef {declRef}}}</DisplayString>
-    <Expand>
-      <Item Name="[op]">op</Item>
-      <Item Name="[type]">type</Item>
-      <Item Name="[declRef]">declRef</Item>
-      <Item Name="[parent]">parent</Item>
-    </Expand>
-  </Type>
   <Type Name="Slang::IRUse">
     <DisplayString>{{IRUse {usedValue}}}</DisplayString>
     <Expand>