Add support in SIL parsing for hasResultDependsOn and hasResultDependsOnSelf

Author: meg-gupta

lib/SIL/Parser/ParseSIL.cpp

@@ -663,37 +663,24 @@ void SILParser::convertRequirements(ArrayRef<RequirementRepr> From,
   }
 }
 
-static bool parseDeclSILOptional(bool *isTransparent,
-                                 IsSerialized_t *isSerialized,
-                                 bool *isCanonical,
-                                 bool *hasOwnershipSSA,
-                                 IsThunk_t *isThunk,
-                                 IsDynamicallyReplaceable_t *isDynamic,
-                                 IsDistributed_t *isDistributed,
-                                 IsRuntimeAccessible_t *isRuntimeAccessible,
-                                 ForceEnableLexicalLifetimes_t *forceEnableLexicalLifetimes,
-                                 UseStackForPackMetadata_t *useStackForPackMetadata,
-                                 bool *hasUnsafeNonEscapableResult,
-                                 IsExactSelfClass_t *isExactSelfClass,
-                                 SILFunction **dynamicallyReplacedFunction,
-                                 SILFunction **usedAdHocRequirementWitness,
-                                 Identifier *objCReplacementFor,
-                                 SILFunction::Purpose *specialPurpose,
-                                 Inline_t *inlineStrategy,
-                                 OptimizationMode *optimizationMode,
-                                 PerformanceConstraints *perfConstraints,
-                                 bool *markedAsUsed,
-                                 StringRef *section,
-                                 bool *isLet,
-                                 bool *isWeakImported,
-                                 bool *needStackProtection,
-                                 AvailabilityContext *availability,
-                                 bool *isWithoutActuallyEscapingThunk,
-                                 SmallVectorImpl<std::string> *Semantics,
-                                 SmallVectorImpl<ParsedSpecAttr> *SpecAttrs,
-                                 ValueDecl **ClangDecl,
-                                 EffectsKind *MRK,
-                                 SILParser &SP, SILModule &M) {
+static bool parseDeclSILOptional(
+    bool *isTransparent, IsSerialized_t *isSerialized, bool *isCanonical,
+    bool *hasOwnershipSSA, bool *hasResultDependsOnSelf, IsThunk_t *isThunk,
+    IsDynamicallyReplaceable_t *isDynamic, IsDistributed_t *isDistributed,
+    IsRuntimeAccessible_t *isRuntimeAccessible,
+    ForceEnableLexicalLifetimes_t *forceEnableLexicalLifetimes,
+    UseStackForPackMetadata_t *useStackForPackMetadata,
+    bool *hasUnsafeNonEscapableResult, IsExactSelfClass_t *isExactSelfClass,
+    SILFunction **dynamicallyReplacedFunction,
+    SILFunction **usedAdHocRequirementWitness, Identifier *objCReplacementFor,
+    SILFunction::Purpose *specialPurpose, Inline_t *inlineStrategy,
+    OptimizationMode *optimizationMode, PerformanceConstraints *perfConstraints,
+    bool *markedAsUsed, StringRef *section, bool *isLet, bool *isWeakImported,
+    bool *needStackProtection, AvailabilityContext *availability,
+    bool *isWithoutActuallyEscapingThunk,
+    SmallVectorImpl<std::string> *Semantics,
+    SmallVectorImpl<ParsedSpecAttr> *SpecAttrs, ValueDecl **ClangDecl,
+    EffectsKind *MRK, SILParser &SP, SILModule &M) {
   while (SP.P.consumeIf(tok::l_square)) {
     if (isLet && SP.P.Tok.is(tok::kw_let)) {
       *isLet = true;
@@ -729,6 +716,9 @@ static bool parseDeclSILOptional(bool *isTransparent,
       *isCanonical = true;
     else if (hasOwnershipSSA && SP.P.Tok.getText() == "ossa")
       *hasOwnershipSSA = true;
+    else if (hasResultDependsOnSelf &&
+             SP.P.Tok.getText() == "_resultDependsOnSelf")
+      *hasResultDependsOnSelf = true;
     else if (needStackProtection && SP.P.Tok.getText() == "stack_protection")
       *needStackProtection = true;
     else if (isThunk && SP.P.Tok.getText() == "thunk")
@@ -6883,9 +6873,11 @@ bool SILParser::parseSILBasicBlock(SILBuilder &B) {
         bool foundEagerMove = false;
         bool foundReborrow = false;
         bool hasPointerEscape = false;
-        while (auto attributeName = parseOptionalAttribute(
-                   {"noImplicitCopy", "_lexical", "_eagerMove",
-                    "closureCapture", "reborrow", "pointer_escape"})) {
+        bool hasResultDependsOn = false;
+        while (
+            auto attributeName = parseOptionalAttribute(
+                {"noImplicitCopy", "_lexical", "_eagerMove", "closureCapture",
+                 "reborrow", "pointer_escape", "_resultDependsOn"})) {
           if (*attributeName == "noImplicitCopy")
             foundNoImplicitCopy = true;
           else if (*attributeName == "_lexical")
@@ -6898,6 +6890,8 @@ bool SILParser::parseSILBasicBlock(SILBuilder &B) {
             foundReborrow = true;
           else if (*attributeName == "pointer_escape")
             hasPointerEscape = true;
+          else if (*attributeName == "_resultDependsOn")
+            hasResultDependsOn = true;
           else {
             llvm_unreachable("Unexpected attribute!");
           }
@@ -6930,6 +6924,7 @@ bool SILParser::parseSILBasicBlock(SILBuilder &B) {
           fArg->setLifetimeAnnotation(lifetime);
           fArg->setReborrow(foundReborrow);
           fArg->setHasPointerEscape(hasPointerEscape);
+          fArg->setHasResultDependsOn(hasResultDependsOn);
           Arg = fArg;
 
           // Today, we construct the ownership kind straight from the function
@@ -7013,6 +7008,7 @@ bool SILParserState::parseDeclSIL(Parser &P) {
   bool hasUnsafeNonEscapableResult = false;
   IsExactSelfClass_t isExactSelfClass = IsNotExactSelfClass;
   bool hasOwnershipSSA = false;
+  bool hasResultDependsOnSelf = false;
   IsThunk_t isThunk = IsNotThunk;
   SILFunction::Purpose specialPurpose = SILFunction::Purpose::None;
   bool isWeakImported = false;
@@ -7034,9 +7030,9 @@ bool SILParserState::parseDeclSIL(Parser &P) {
   if (parseSILLinkage(FnLinkage, P) ||
       parseDeclSILOptional(
           &isTransparent, &isSerialized, &isCanonical, &hasOwnershipSSA,
-          &isThunk, &isDynamic, &isDistributed, &isRuntimeAccessible,
-          &forceEnableLexicalLifetimes, &useStackForPackMetadata,
-          &hasUnsafeNonEscapableResult,
+          &hasResultDependsOnSelf, &isThunk, &isDynamic, &isDistributed,
+          &isRuntimeAccessible, &forceEnableLexicalLifetimes,
+          &useStackForPackMetadata, &hasUnsafeNonEscapableResult,
           &isExactSelfClass, &DynamicallyReplacedFunction,
           &AdHocWitnessFunction, &objCReplacementFor, &specialPurpose,
           &inlineStrategy, &optimizationMode, &perfConstr, &markedAsUsed,
@@ -7070,6 +7066,7 @@ bool SILParserState::parseDeclSIL(Parser &P) {
     FunctionState.F->setWasDeserializedCanonical(isCanonical);
     if (!hasOwnershipSSA)
       FunctionState.F->setOwnershipEliminated();
+    FunctionState.F->setHasResultDependsOnSelf(hasResultDependsOnSelf);
     FunctionState.F->setThunk(IsThunk_t(isThunk));
     FunctionState.F->setIsDynamic(isDynamic);
     FunctionState.F->setIsDistributed(isDistributed);
@@ -7290,9 +7287,9 @@ bool SILParserState::parseSILGlobal(Parser &P) {
       parseDeclSILOptional(nullptr, &isSerialized, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, nullptr, nullptr, nullptr, &isLet, nullptr,
+                           nullptr, nullptr, nullptr, nullptr, nullptr, &isLet,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, State, M) ||
+                           nullptr, nullptr, State, M) ||
       P.parseToken(tok::at_sign, diag::expected_sil_value_name) ||
       P.parseIdentifier(GlobalName, NameLoc, /*diagnoseDollarPrefix=*/false,
                         diag::expected_sil_value_name) ||
@@ -7344,7 +7341,7 @@ bool SILParserState::parseSILProperty(Parser &P) {
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, SP, M))
+                           nullptr, nullptr, SP, M))
     return true;
 
   ValueDecl *VD;
@@ -7414,7 +7411,7 @@ bool SILParserState::parseSILVTable(Parser &P) {
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, VTableState, M))
+                           nullptr, nullptr, VTableState, M))
     return true;
 
   // Parse the class name.
@@ -7525,7 +7522,7 @@ bool SILParserState::parseSILMoveOnlyDeinit(Parser &parser) {
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, moveOnlyDeinitTableState, M))
+                           nullptr, nullptr, moveOnlyDeinitTableState, M))
     return true;
 
   // Parse the class name.
@@ -8012,7 +8009,7 @@ bool SILParserState::parseSILWitnessTable(Parser &P) {
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
                            nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                           nullptr, WitnessState, M))
+                           nullptr, nullptr, WitnessState, M))
     return true;
 
   // Parse the protocol conformance.