Ensure we preserve vn and produce a canonical tree

Author: tannergooding

src/coreclr/jit/morph.cpp

@@ -7484,7 +7484,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
                             JITDUMP("\nTransforming:\n");
                             DISPTREE(tree);
 
-                            otherNode->SetOper(GT_AND); // Change % => &
+                            otherNode->SetOper(GT_AND, GenTree::PRESERVE_VN); // Change % => &
                             otherNode->gtFlags &= ~(GTF_DIV_MOD_NO_OVERFLOW | GTF_DIV_MOD_NO_BY_ZERO);
 
                             divisor->AsIntConCommon()->SetIconValue(modValue - 1); // Change c => c - 1
@@ -7906,7 +7906,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
                     goto CM_ADD_OP;
                 }
 
-                /* Check for "cns1 - op2" , we change it to "(cns1 + (-op2))" */
+                /* Check for "cns1 - op2" , we change it to "((-op2) + cns1)" */
 
                 noway_assert(op1);
                 if (op1->IsCnsIntOrI())
@@ -7929,7 +7929,8 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
                         return tree;
                     }
 
-                    tree->AsOp()->gtOp2 = op2 = gtNewOperNode(GT_NEG, genActualType(op2->TypeGet()), op2);
+                    tree->AsOp()->gtOp2 = op2 = op1;
+                    tree->AsOp()->gtOp1 = op1 = gtNewOperNode(GT_NEG, genActualType(op2->TypeGet()), op2);
                     fgMorphTreeDone(op2);
 
                     oper = GT_ADD;