Clean up XFA code which causes warnings

xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

Index: xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 41a0acd70bf8e30d7bbc190b40547221d7366827..5bd8f08970e3a0bfb4c67af91f7599e06d54273c 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -886,13 +886,13 @@ static CXFA_Node* XFA_DataMerge_CopyContainer_SubformSet(
                                                 pTemplateChild, TRUE);
           } else if (pTemplateChild->GetObjectType() ==
                      XFA_OBJECTTYPE_ContainerNode) {
-            CXFA_Node* pDataMatch;
             bSelfMatch = FALSE;
             eBindMatch = XFA_ATTRIBUTEENUM_None;
+            CXFA_Node* pDataMatch;
             if (eRelation != XFA_ATTRIBUTEENUM_Ordered &&
                 (pDataMatch = XFA_DataMerge_FindMatchingDataNode(
                      pDocument, pTemplateChild, pDataScope, bAccessedDataDOM,
-                     FALSE, NULL, bSelfMatch, eBindMatch))) {
+                     FALSE, NULL, bSelfMatch, eBindMatch)) != nullptr) {
               XFA_DataMerge_RecurseRecord sNewRecord = {pTemplateChild,
                                                         pDataMatch};
               if (bSelfMatch) {