@@ -399,6 +399,34 @@ edges
 | test.cpp:411:39:411:41 | call to get [x] | test.cpp:412:11:412:11 | *e [x] | provenance |  |
 | test.cpp:412:11:412:11 | *e [x] | test.cpp:412:13:412:13 | x | provenance |  |
 | test.cpp:412:13:412:13 | x | test.cpp:412:13:412:13 | x | provenance | Sink:MaD:3 |
+| test.cpp:417:3:417:28 | *ElementWithOverloadedArity [post update] [x] | test.cpp:417:3:417:28 | *this [Return] [x] | provenance |  |
+| test.cpp:417:34:417:38 | first | test.cpp:417:45:417:49 | first | provenance |  |
+| test.cpp:417:45:417:49 | first | test.cpp:417:3:417:28 | *ElementWithOverloadedArity [post update] [x] | provenance |  |
+| test.cpp:418:3:418:28 | *ElementWithOverloadedArity [post update] [x] | test.cpp:418:3:418:28 | *this [Return] [x] | provenance |  |
+| test.cpp:418:39:418:44 | second | test.cpp:418:51:418:56 | second | provenance |  |
+| test.cpp:418:51:418:56 | second | test.cpp:418:3:418:28 | *ElementWithOverloadedArity [post update] [x] | provenance |  |
+| test.cpp:422:11:422:19 | call to ymlSource | test.cpp:422:11:422:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:422:11:422:19 | call to ymlSource | test.cpp:425:18:425:18 | *x | provenance |  |
+| test.cpp:422:11:422:19 | call to ymlSource | test.cpp:430:18:430:18 | *x | provenance |  |
+| test.cpp:422:11:422:19 | call to ymlSource | test.cpp:435:21:435:21 | *x | provenance |  |
+| test.cpp:425:5:425:5 | emplace output argument [element, x] | test.cpp:426:13:426:13 | *c [element, x] | provenance |  |
+| test.cpp:425:18:425:18 | *x | test.cpp:417:34:417:38 | first | provenance |  |
+| test.cpp:425:18:425:18 | *x | test.cpp:425:5:425:5 | emplace output argument [element, x] | provenance |  |
+| test.cpp:426:13:426:13 | *c [element, x] | test.cpp:426:18:426:20 | *call to get [x] | provenance | MaD:87 |
+| test.cpp:426:18:426:20 | *call to get [x] | test.cpp:426:21:426:21 | x | provenance |  |
+| test.cpp:426:21:426:21 | x | test.cpp:426:21:426:21 | x | provenance | Sink:MaD:3 |
+| test.cpp:430:5:430:5 | emplace output argument [element, x] | test.cpp:431:13:431:13 | *c [element, x] | provenance |  |
+| test.cpp:430:18:430:18 | *x | test.cpp:417:34:417:38 | first | provenance |  |
+| test.cpp:430:18:430:18 | *x | test.cpp:430:5:430:5 | emplace output argument [element, x] | provenance |  |
+| test.cpp:431:13:431:13 | *c [element, x] | test.cpp:431:18:431:20 | *call to get [x] | provenance | MaD:87 |
+| test.cpp:431:18:431:20 | *call to get [x] | test.cpp:431:21:431:21 | x | provenance |  |
+| test.cpp:431:21:431:21 | x | test.cpp:431:21:431:21 | x | provenance | Sink:MaD:3 |
+| test.cpp:435:5:435:5 | emplace output argument [element, x] | test.cpp:436:13:436:13 | *c [element, x] | provenance |  |
+| test.cpp:435:21:435:21 | *x | test.cpp:418:39:418:44 | second | provenance |  |
+| test.cpp:435:21:435:21 | *x | test.cpp:435:5:435:5 | emplace output argument [element, x] | provenance |  |
+| test.cpp:436:13:436:13 | *c [element, x] | test.cpp:436:18:436:20 | *call to get [x] | provenance | MaD:87 |
+| test.cpp:436:18:436:20 | *call to get [x] | test.cpp:436:21:436:21 | x | provenance |  |
+| test.cpp:436:21:436:21 | x | test.cpp:436:21:436:21 | x | provenance | Sink:MaD:3 |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:24:8:24:11 | * ... | provenance |  |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:27:36:27:38 | *cmd | provenance |  |
 | windows.cpp:22:15:22:29 | call to GetCommandLineA | windows.cpp:22:15:22:29 | *call to GetCommandLineA | provenance | Src:MaD:5  |
@@ -907,6 +935,34 @@ nodes
 | test.cpp:412:11:412:11 | *e [x] | semmle.label | *e [x] |
 | test.cpp:412:13:412:13 | x | semmle.label | x |
 | test.cpp:412:13:412:13 | x | semmle.label | x |
+| test.cpp:417:3:417:28 | *ElementWithOverloadedArity [post update] [x] | semmle.label | *ElementWithOverloadedArity [post update] [x] |
+| test.cpp:417:3:417:28 | *this [Return] [x] | semmle.label | *this [Return] [x] |
+| test.cpp:417:34:417:38 | first | semmle.label | first |
+| test.cpp:417:45:417:49 | first | semmle.label | first |
+| test.cpp:418:3:418:28 | *ElementWithOverloadedArity [post update] [x] | semmle.label | *ElementWithOverloadedArity [post update] [x] |
+| test.cpp:418:3:418:28 | *this [Return] [x] | semmle.label | *this [Return] [x] |
+| test.cpp:418:39:418:44 | second | semmle.label | second |
+| test.cpp:418:51:418:56 | second | semmle.label | second |
+| test.cpp:422:11:422:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:422:11:422:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:425:5:425:5 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:425:18:425:18 | *x | semmle.label | *x |
+| test.cpp:426:13:426:13 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:426:18:426:20 | *call to get [x] | semmle.label | *call to get [x] |
+| test.cpp:426:21:426:21 | x | semmle.label | x |
+| test.cpp:426:21:426:21 | x | semmle.label | x |
+| test.cpp:430:5:430:5 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:430:18:430:18 | *x | semmle.label | *x |
+| test.cpp:431:13:431:13 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:431:18:431:20 | *call to get [x] | semmle.label | *call to get [x] |
+| test.cpp:431:21:431:21 | x | semmle.label | x |
+| test.cpp:431:21:431:21 | x | semmle.label | x |
+| test.cpp:435:5:435:5 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:435:21:435:21 | *x | semmle.label | *x |
+| test.cpp:436:13:436:13 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:436:18:436:20 | *call to get [x] | semmle.label | *call to get [x] |
+| test.cpp:436:21:436:21 | x | semmle.label | x |
+| test.cpp:436:21:436:21 | x | semmle.label | x |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | semmle.label | *call to GetCommandLineA |
 | windows.cpp:22:15:22:29 | call to GetCommandLineA | semmle.label | call to GetCommandLineA |
 | windows.cpp:24:8:24:11 | * ... | semmle.label | * ... |
@@ -1130,4 +1186,7 @@ subpaths
 | test.cpp:172:51:172:51 | x | test.cpp:164:34:164:34 | x | test.cpp:164:7:164:7 | *templateFunction3 | test.cpp:172:13:172:44 | call to templateFunction3 |
 | test.cpp:362:15:362:15 | *x | test.cpp:341:30:341:32 | arg | test.cpp:341:3:341:22 | *this [Return] [s] | test.cpp:362:5:362:5 | forward output argument [s] |
 | test.cpp:371:15:371:16 | *ul | test.cpp:345:38:345:40 | arg | test.cpp:345:3:345:22 | *this [Return] [ul] | test.cpp:371:5:371:5 | forward output argument [ul] |
+| test.cpp:425:18:425:18 | *x | test.cpp:417:34:417:38 | first | test.cpp:417:3:417:28 | *this [Return] [x] | test.cpp:425:5:425:5 | emplace output argument [element, x] |
+| test.cpp:430:18:430:18 | *x | test.cpp:417:34:417:38 | first | test.cpp:417:3:417:28 | *this [Return] [x] | test.cpp:430:5:430:5 | emplace output argument [element, x] |
+| test.cpp:435:21:435:21 | *x | test.cpp:418:39:418:44 | second | test.cpp:418:3:418:28 | *this [Return] [x] | test.cpp:435:5:435:5 | emplace output argument [element, x] |
 testFailures
@@ -49,3 +49,6 @@
 | test.cpp:375:15:375:16 | ul | test-sink |
 | test.cpp:398:13:398:13 | x | test-sink |
 | test.cpp:412:13:412:13 | x | test-sink |
+| test.cpp:426:21:426:21 | x | test-sink |
+| test.cpp:431:21:431:21 | x | test-sink |
+| test.cpp:436:21:436:21 | x | test-sink |
@@ -23,6 +23,7 @@
 | test.cpp:370:24:370:32 | call to ymlSource | local |
 | test.cpp:394:11:394:19 | call to ymlSource | local |
 | test.cpp:408:11:408:19 | call to ymlSource | local |
+| test.cpp:422:11:422:19 | call to ymlSource | local |
 | windows.cpp:22:15:22:29 | call to GetCommandLineA | local |
 | windows.cpp:34:17:34:38 | call to GetEnvironmentStringsA | local |
 | windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | local |
 
@@ -410,4 +410,29 @@ void forward_test_model_with_default_argument() {
 
   ElementWithDefaultArgument e = c.get();
   ymlSink(e.x); // $ ir
+}
+
+struct ElementWithOverloadedArity {
+  int x;
+  ElementWithOverloadedArity(int first) : x(first) {}
+  ElementWithOverloadedArity(int, int second) : x(second) {}
+};
+
+void forward_test_constructor_arity() {
+  int x = ymlSource();
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, x);
+    ymlSink(c.get().x); // $ ir
+  }
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, x, 0);
+    ymlSink(c.get().x); // $ SPURIOUS: ir
+  }
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, 0, x);
+    ymlSink(c.get().x); // $ ir
+  }
 }