SIL: Preserve ApplyOptions in a couple more places

slavapestov · slavapestov · commit d8d6da8578f6 · 2021-03-29T23:51:25.000-04:00
Noticed by inspection.
diff --git a/lib/IRGen/LoadableByAddress.cpp b/lib/IRGen/LoadableByAddress.cpp
@@ -2540,7 +2540,8 @@ void LoadableByAddress::recreateSingleApply(
     applyBuilder.createTryApply(
         castedApply->getLoc(), callee,
         applySite.getSubstitutionMap(), callArgs,
-        castedApply->getNormalBB(), castedApply->getErrorBB());
+        castedApply->getNormalBB(), castedApply->getErrorBB(),
+        castedApply->getApplyOptions());
     break;
   }
   case SILInstructionKind::BeginApplyInst: {
diff --git a/lib/Serialization/DeserializeSIL.cpp b/lib/Serialization/DeserializeSIL.cpp
@@ -1551,7 +1551,8 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     SubstitutionMap Substitutions = MF->getSubstitutionMap(NumSubs);
 
     ResultInst = Builder.createTryApply(Loc, getLocalValue(ValID, FnTy),
-                                        Substitutions, Args, normalBB, errorBB);
+                                        Substitutions, Args, normalBB, errorBB,
+                                        ApplyOpts);
     break;
   }
   case SILInstructionKind::PartialApplyInst: {

Original file line number	Diff line number	Diff line change
`@@ -1551,7 +1551,8 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,`
`1551`	`1551`	`SubstitutionMap Substitutions = MF->getSubstitutionMap(NumSubs);`
`1552`	`1552`
`1553`	`1553`	`ResultInst = Builder.createTryApply(Loc, getLocalValue(ValID, FnTy),`
`1554`		`- Substitutions, Args, normalBB, errorBB);`
	`1554`	`+ Substitutions, Args, normalBB, errorBB,`
	`1555`	`+ ApplyOpts);`
`1555`	`1556`	`break;`
`1556`	`1557`	`}`
`1557`	`1558`	`case SILInstructionKind::PartialApplyInst: {`