EscapeAnalysis: change the parameter of isNonWritableMemoryAddress from SILNode* to SILValue

A small cleanup, NFC.

Author: eeckstein

lib/SILOptimizer/Analysis/EscapeAnalysis.cpp

@@ -207,20 +207,20 @@ SILValue EscapeAnalysis::getPointerRoot(SILValue value) {
   return value;
 }
 
-static bool isNonWritableMemoryAddress(SILNode *V) {
+static bool isNonWritableMemoryAddress(SILValue V) {
   switch (V->getKind()) {
-  case SILNodeKind::FunctionRefInst:
-  case SILNodeKind::DynamicFunctionRefInst:
-  case SILNodeKind::PreviousDynamicFunctionRefInst:
-  case SILNodeKind::WitnessMethodInst:
-  case SILNodeKind::ClassMethodInst:
-  case SILNodeKind::SuperMethodInst:
-  case SILNodeKind::ObjCMethodInst:
-  case SILNodeKind::ObjCSuperMethodInst:
-  case SILNodeKind::StringLiteralInst:
-  case SILNodeKind::ThinToThickFunctionInst:
-  case SILNodeKind::ThinFunctionToPointerInst:
-  case SILNodeKind::PointerToThinFunctionInst:
+  case ValueKind::FunctionRefInst:
+  case ValueKind::DynamicFunctionRefInst:
+  case ValueKind::PreviousDynamicFunctionRefInst:
+  case ValueKind::WitnessMethodInst:
+  case ValueKind::ClassMethodInst:
+  case ValueKind::SuperMethodInst:
+  case ValueKind::ObjCMethodInst:
+  case ValueKind::ObjCSuperMethodInst:
+  case ValueKind::StringLiteralInst:
+  case ValueKind::ThinToThickFunctionInst:
+  case ValueKind::ThinFunctionToPointerInst:
+  case ValueKind::PointerToThinFunctionInst:
     // These instructions return pointers to memory which can't be a
     // destination of a store.
     return true;
@@ -1622,8 +1622,10 @@ void EscapeAnalysis::ConnectionGraph::verify() const {
   ReachableBlocks reachable(F);
   reachable.visit([this](SILBasicBlock *bb) {
     for (auto &i : *bb) {
-      if (isNonWritableMemoryAddress(&i))
-        continue;
+      if (auto *svi = dyn_cast<SingleValueInstruction>(&i)) {
+        if (isNonWritableMemoryAddress(svi))
+          continue;
+      }
 
       if (auto ai = dyn_cast<ApplyInst>(&i)) {
         if (EA->canOptimizeArrayUninitializedCall(ai).isValid())
@@ -2060,17 +2062,17 @@ void EscapeAnalysis::analyzeInstruction(SILInstruction *I,
   if (auto *SVI = dyn_cast<SingleValueInstruction>(I)) {
     if (getPointerBase(SVI))
       return;
+
+    // Instructions which return the address of non-writable memory cannot have
+    // an effect on escaping.
+    if (isNonWritableMemoryAddress(SVI))
+      return;
   }
 
   // Incidental uses produce no values and have no effect on their operands.
   if (isIncidentalUse(I))
     return;
 
-  // Instructions which return the address of non-writable memory cannot have
-  // an effect on escaping.
-  if (isNonWritableMemoryAddress(I))
-    return;
-
   switch (I->getKind()) {
     case SILInstructionKind::AllocStackInst:
     case SILInstructionKind::AllocRefInst: