Merge pull request #24906 from gottesmm/pr-086b5df86583874c4bef884b5a495e2a1d16845c

Teach ConstExpr how to look through begin_borrow, copy_value and to i…

Author: gottesmm

lib/SILOptimizer/Utils/ConstExpr.cpp

@@ -406,6 +406,11 @@ SymbolicValue ConstExprFunctionState::computeConstantValue(SILValue value) {
   if (auto *bai = dyn_cast<BeginAccessInst>(value))
     return getConstantValue(bai->getOperand());
 
+  // Look through copy_value and begin_borrow since the interpreter doesn't
+  // model these memory management instructions.
+  if (isa<CopyValueInst>(value) || isa<BeginBorrowInst>(value))
+    return getConstantValue(cast<SingleValueInstruction>(value)->getOperand(0));
+
   LLVM_DEBUG(llvm::dbgs() << "ConstExpr Unknown simple: " << *value << "\n");
 
   // Otherwise, we don't know how to handle this.
@@ -1292,7 +1297,8 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
       // skip them.
       isa<DestroyAddrInst>(inst) || isa<RetainValueInst>(inst) ||
       isa<ReleaseValueInst>(inst) || isa<StrongRetainInst>(inst) ||
-      isa<StrongReleaseInst>(inst))
+      isa<StrongReleaseInst>(inst) || isa<DestroyValueInst>(inst) ||
+      isa<EndBorrowInst>(inst))
     return None;
 
   // If this is a special flow-sensitive instruction like a stack allocation,
@@ -1302,6 +1308,15 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
     return None;
   }
 
+  // Make sure that our copy_value, begin_borrow form constants. Otherwise,
+  // return why.
+  if (isa<CopyValueInst>(inst) || isa<BeginBorrowInst>(inst)) {
+    auto result = getConstantValue(inst->getOperand(0));
+    if (!result.isConstant())
+      return result;
+    return None;
+  }
+
   // If this is a deallocation of a memory object that we are tracking, then
   // don't do anything.  The memory is allocated in a BumpPtrAllocator so there
   // is no useful way to free it.