C++: accept false positive tests after merge

The IR false positives are due to the same path length limit as the AST
false positives on the same line.

Author: rdmarsh2

cpp/ql/test/library-tests/dataflow/fields/complex.cpp

@@ -48,8 +48,8 @@ void bar(Outer &b)
   // in _some_ access path somewhere in the search. That makes the library conclude
   // that there could be flow to `b.inner.f.a_` even when the flow was actually to
   // `b.inner.f.b_`.
-  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $ir=62:19 $ir=64:19
-  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $ir=63:19 $ir=65:19
+  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $ir=62:19 $f+:ir=63:19 $ir=64:19 $f+:ir=65:19
+  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $f+:ir=62:19 $ir=63:19 $f+:ir=64:19 $ir=65:19
 }
 
 void foo()

cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected

@@ -1,4 +0,0 @@
-| complex.cpp:51:18:51:18 | call to a | Unexpected result: ir=63:19 |
-| complex.cpp:51:18:51:18 | call to a | Unexpected result: ir=65:19 |
-| complex.cpp:52:18:52:18 | call to b | Unexpected result: ir=62:19 |
-| complex.cpp:52:18:52:18 | call to b | Unexpected result: ir=64:19 |