SILModule::hasLoweredAddress

Author: atrick

include/swift/SIL/SILModule.h

@@ -307,6 +307,12 @@ class SILModule {
   /// The stage of processing this module is at.
   SILStage Stage;
 
+  /// True if SIL conventions force address-only to be passed by address.
+  ///
+  /// Used for bootstrapping the AddressLowering pass. This should eventually
+  /// be inferred from the SIL stage to be true only when Stage == Lowered.
+  bool loweredAddresses;
+
   /// The set of deserialization notification handlers.
   DeserializationNotificationHandlerSet deserializationNotificationHandlers;
 
@@ -796,6 +802,11 @@ class SILModule {
     Stage = s;
   }
 
+  /// True if SIL conventions force address-only to be passed by address.
+  bool useLoweredAddresses() const { return loweredAddresses; }
+
+  void setLoweredAddresses(bool val) { loweredAddresses = val; }
+
   llvm::IndexedInstrProfReader *getPGOReader() const { return PGOReader.get(); }
 
   void setPGOReader(std::unique_ptr<llvm::IndexedInstrProfReader> IPR) {
@@ -962,15 +973,13 @@ inline bool SILOptions::supportsLexicalLifetimes(const SILModule &mod) const {
     // entirely.
     return LexicalLifetimes != LexicalLifetimesOption::Off;
   case SILStage::Canonical:
+  case SILStage::Lowered:
     // In Canonical SIL, lexical markers are used to ensure that object
     // lifetimes do not get observably shortened from the end of a lexical
     // scope.  That behavior only occurs when lexical lifetimes is (fully)
     // enabled.  (When only diagnostic markers are enabled, the markers are
     // stripped as part of lowering from raw to canonical SIL.)
     return LexicalLifetimes == LexicalLifetimesOption::On;
-  case SILStage::Lowered:
-    // We do not support OSSA in Lowered SIL, so this is always false.
-    return false;
   }
 }
 

lib/SIL/IR/SILModule.cpp

@@ -91,8 +91,8 @@ class SILModule::SerializationCallback final
 
 SILModule::SILModule(llvm::PointerUnion<FileUnit *, ModuleDecl *> context,
                      Lowering::TypeConverter &TC, const SILOptions &Options)
-    : Stage(SILStage::Raw), indexTrieRoot(new IndexTrieNode()),
-      Options(Options), serialized(false),
+    : Stage(SILStage::Raw), loweredAddresses(!Options.EnableSILOpaqueValues),
+      indexTrieRoot(new IndexTrieNode()), Options(Options), serialized(false),
       regDeserializationNotificationHandlerForNonTransparentFuncOME(false),
       regDeserializationNotificationHandlerForAllFuncOME(false),
       prespecializedFunctionDeclsImported(false), SerializeSILAction(),

lib/SIL/IR/SILType.cpp

@@ -506,10 +506,7 @@ SILResultInfo::getOwnershipKind(SILFunction &F,
 }
 
 SILModuleConventions::SILModuleConventions(SILModule &M)
-    : M(&M),
-      loweredAddresses(!M.getOptions().EnableSILOpaqueValues
-                       || M.getStage() == SILStage::Lowered)
-{}
+    : M(&M), loweredAddresses(M.useLoweredAddresses()) {}
 
 bool SILModuleConventions::isReturnedIndirectlyInSIL(SILType type,
                                                      SILModule &M) {

lib/SIL/Parser/ParseSIL.cpp

@@ -6533,6 +6533,9 @@ bool SILParserState::parseDeclSILStage(Parser &P) {
   }
 
   M.setStage(stage);
+  if (M.getOptions().EnableSILOpaqueValues) {
+    M.setLoweredAddresses(stage != SILStage::Raw);
+  }
   DidParseSILStage = true;
   return false;
 }

lib/SILGen/SILGenFunction.cpp

@@ -290,13 +290,12 @@ void SILGenFunction::emitCaptures(SILLocation loc,
     // Get an address value for a SILValue if it is address only in an type
     // expansion context without opaque archetype substitution.
     auto getAddressValue = [&](SILValue entryValue) -> SILValue {
-      if (SGM.Types
-              .getTypeLowering(
-                  valueType,
-                  TypeExpansionContext::noOpaqueTypeArchetypesSubstitution(
-                      expansion.getResilienceExpansion()))
-              .isAddressOnly() &&
-          !entryValue->getType().isAddress()) {
+      if (SGM.Types.getTypeLowering(
+            valueType,
+            TypeExpansionContext::noOpaqueTypeArchetypesSubstitution(
+              expansion.getResilienceExpansion()))
+          .isAddressOnly()
+          && !entryValue->getType().isAddress()) {
 
         auto addr = emitTemporaryAllocation(vd, entryValue->getType());
         auto val = B.emitCopyValueOperation(vd, entryValue);

lib/SILGen/SILGenFunction.h

@@ -245,6 +245,8 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// The SILModuleConventions for this SIL module.
   SILModuleConventions silConv;
 
+  bool useLoweredAddresses() const { return silConv.useLoweredAddresses(); }
+
   /// The DeclContext corresponding to the function currently being emitted.
   DeclContext * const FunctionDC;
 

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -1527,13 +1527,15 @@ void AddressLowering::runOnFunction(SILFunction *F) {
 
 /// The entry point to this function transformation.
 void AddressLowering::run() {
-  if (getModule()->getOptions().EnableSILOpaqueValues) {
-    for (auto &F : *getModule())
-      runOnFunction(&F);
+  if (getModule()->useLoweredAddresses())
+    return;
+
+  for (auto &F : *getModule()) {
+    runOnFunction(&F);
   }
-  // Set the SIL state before the PassManager has a chance to run
+  // Update the SILModule before the PassManager has a chance to run
   // verification.
-  getModule()->setStage(SILStage::Lowered);
+  getModule()->setLoweredAddresses(true);
 }
 
 SILTransform *swift::createAddressLowering() { return new AddressLowering(); }

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -87,12 +87,14 @@ static void addModulePrinterPipeline(SILPassPipelinePlan &plan,
 
 static void addMandatoryDebugSerialization(SILPassPipelinePlan &P) {
   P.startPipeline("Mandatory Debug Serialization");
+  P.addAddressLowering();
   P.addOwnershipModelEliminator();
   P.addMandatoryInlining();
 }
 
 static void addOwnershipModelEliminatorPipeline(SILPassPipelinePlan &P) {
   P.startPipeline("Ownership Model Eliminator");
+  P.addAddressLowering();
   P.addOwnershipModelEliminator();
 }
 
@@ -113,6 +115,7 @@ static void addDefiniteInitialization(SILPassPipelinePlan &P) {
 static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
   P.startPipeline("Mandatory Diagnostic Passes + Enabling Optimization Passes");
   P.addSILGenCleanup();
+  P.addAddressLowering();
   P.addDiagnoseInvalidEscapingCaptures();
   P.addDiagnoseStaticExclusivity();
   P.addNestedSemanticFunctionCheck();
@@ -796,11 +799,10 @@ static void addSILDebugInfoGeneratorPipeline(SILPassPipelinePlan &P) {
 SILPassPipelinePlan
 SILPassPipelinePlan::getLoweringPassPipeline(const SILOptions &Options) {
   SILPassPipelinePlan P(Options);
-  P.startPipeline("Address Lowering");
+  P.startPipeline("Lowering");
   P.addLowerHopToActor(); // FIXME: earlier for more opportunities?
   P.addOwnershipModelEliminator();
   P.addIRGenPrepare();
-  P.addAddressLowering();
 
   return P;
 }
@@ -913,7 +915,7 @@ SILPassPipelinePlan::getOnonePassPipeline(const SILOptions &Options) {
   // depend on other passes needed for diagnostics). Thus we can run them later
   // and avoid having SourceKit run these passes when just emitting diagnostics
   // in the editor.
-  P.startPipeline("non-Diagnostic Enabling Mandatory Optimizations");
+  P.startPipeline("Non-Diagnostic Mandatory Optimizations");
   P.addForEachLoopUnroll();
   P.addMandatoryCombine();
 

lib/SILOptimizer/PassManager/Passes.cpp

@@ -213,7 +213,7 @@ void swift::runSILLoweringPasses(SILModule &Module) {
                           SILPassPipelinePlan::getLoweringPassPipeline(opts),
                           /*isMandatory*/ true);
 
-  assert(Module.getStage() == SILStage::Lowered);
+  Module.setStage(SILStage::Lowered);
 }
 
 /// Registered briged pass run functions.