Merge commit 'bcec41e5e6e6' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/Transforms/Scalar/NewGVN.cpp

@@ -2066,6 +2066,7 @@ NewGVN::performSymbolicEvaluation(Instruction *I,
   case Instruction::FPTrunc:
   case Instruction::FPExt:
   case Instruction::PtrToInt:
+  case Instruction::PtrToAddr:
   case Instruction::IntToPtr:
   case Instruction::Select:
   case Instruction::ExtractElement:

llvm/test/Transforms/NewGVN/ptrtoaddr.ll

@@ -4,10 +4,7 @@
 define i64 @ptrtoaddr_same(ptr %p) {
 ; CHECK-LABEL: define i64 @ptrtoaddr_same(
 ; CHECK-SAME: ptr [[P:%.*]]) {
-; CHECK-NEXT:    [[J:%.*]] = ptrtoaddr ptr [[P]] to i64
-; CHECK-NEXT:    [[J1:%.*]] = ptrtoaddr ptr [[P]] to i64
-; CHECK-NEXT:    [[SUB:%.*]] = sub i64 [[J]], [[J1]]
-; CHECK-NEXT:    ret i64 [[SUB]]
+; CHECK-NEXT:    ret i64 0
 ;
   %i = ptrtoaddr ptr %p to i64
   %j = ptrtoaddr ptr %p to i64