Fixed incorrectly resolved merge conflict in the SILGen.cpp

Author: nickolas-pohilets

lib/SILGen/SILGen.cpp

@@ -762,12 +762,9 @@ SILFunction *SILGenModule::getFunction(SILDeclRef constant,
     // destroyer.
     F->setActorIsolation(ActorIsolation::forNonisolated(false));
   } else {
-    // If we have global actor isolation for our constant, put the isolation
-    // onto the function.
-    if (auto isolation =
-            getActorIsolationOfContext(constant.getInnermostDeclContext())) {
-      F->setActorIsolation(isolation);
-    }
+    // If we have global actor isolation for our constant, put the isolation onto
+    // the function.
+    F->setActorIsolation(getActorIsolationOfContext(constant.getInnermostDeclContext()));
   }
 
   assert(F && "SILFunction should have been defined");
@@ -1132,7 +1129,6 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
   }
   case SILDeclRef::Kind::Deallocator: {
     auto *dd = cast<DestructorDecl>(constant.getDecl());
-    auto *nom = dd->getDeclContext()->getSelfNominalTypeDecl();
 
     if (needsIsolatingDestructor(dd)) {
       auto loc = RegularLocation::getAutoGeneratedLocation(dd);
@@ -1266,10 +1262,7 @@ void SILGenModule::preEmitFunction(SILDeclRef constant, SILFunction *F,
   } else {
     // If we have global actor isolation for our constant, put the isolation
     // onto the function.
-    if (auto isolation =
-            getActorIsolationOfContext(constant.getInnermostDeclContext())) {
-      F->setActorIsolation(isolation);
-    }
+    F->setActorIsolation(getActorIsolationOfContext(constant.getInnermostDeclContext()));
   }
 
   // Create a debug scope for the function using astNode as source location.