more minor SILGen notes / improvements

Author: kavon

lib/SILGen/ManagedValue.cpp

@@ -123,6 +123,11 @@ void ManagedValue::copyInto(SILGenFunction &SGF, SILLocation loc,
   dest->finishInitialization(SGF);
 }
 
+/// FIXME: There's no material difference between this anc ::copy, despite
+///   what this comment below says about ::copyUnmanaged!
+///
+///   Most users should always use ensurePlusOne instead!
+
 /// This is the same operation as 'copy', but works on +0 values that don't
 /// have cleanups.  It returns a +1 value with one.
 ManagedValue ManagedValue::copyUnmanaged(SILGenFunction &SGF, SILLocation loc) {

lib/SILGen/SILGenLValue.cpp

@@ -3660,8 +3660,7 @@ RValue SILGenFunction::emitRValueForNonMemberVarDecl(SILLocation loc,
     // If we have self, see if we are in an 'init' delegation sequence. If so,
     // call out to the special delegation init routine. Otherwise, use the
     // normal RValue emission logic.
-    if (var->getName() == getASTContext().Id_self &&
-        SelfInitDelegationState != NormalSelf) {
+    if (var->isSelfParameter() && SelfInitDelegationState != NormalSelf) {
       auto rvalue =
         emitRValueForSelfInDelegationInit(loc, formalRValueType, accessAddr, C);
       return propagateRValuePastAccess(std::move(rvalue));
@@ -3715,7 +3714,7 @@ RValue SILGenFunction::emitRValueForNonMemberVarDecl(SILLocation loc,
     // This is a 'let', so we can make guarantees.
     return RValue(*this, loc, formalRValueType,
                   C.isGuaranteedPlusZeroOk()
-                    ? Result : Result.copyUnmanaged(*this, loc));
+                    ? Result : Result.ensurePlusOne(*this, loc));
   }
 
   LValue lv = emitLValueForNonMemberVarDecl(