Merge branch 'main' into set

2026-04-28 18:25:24 +02:00 · 2020-10-05 15:16:42 +01:00
parent d4a1acedde 297f1c75e4
commit 4db964fca9
77 changed files with 1600 additions and 1638 deletions
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
@@ -39,8 +39,8 @@ void test_pair()

 	std::pair<char *, char *> e(source(), "456");
 	sink(e.first); // tainted
-	sink(e.second); // [FALSE POSITIVE]
-	sink(e); // tainted
+	sink(e.second);
+	sink(e); // tainted [NOT DETECTED]

 	std::pair<char *, char *> f("123", source());
 	sink(f.first); // [FALSE POSITIVE]
@@ -80,19 +80,19 @@ void test_pair()
 	sink(make_pair("123", "456"));
 	sink(make_pair("123", "456").first);
 	sink(make_pair("123", "456").second);
-	sink(make_pair(source(), "456")); // tainted
-	sink(make_pair(source(), "456").first); // tainted
-	sink(make_pair(source(), "456").second); // [FALSE POSITIVE]
+	sink(make_pair(source(), "456")); // tainted [NOT DETECTED]
+	sink(make_pair(source(), "456").first); // tainted [NOT DETECTED]
+	sink(make_pair(source(), "456").second);
 	sink(make_pair("123", source())); // tainted
 	sink(make_pair("123", source()).first); // [FALSE POSITIVE]
 	sink(make_pair("123", source()).second); // tainted

 	std::pair<std::pair<char *, char *>, char *> m;
 	m = make_pair(make_pair("123", source()), "789");
-	sink(m); // tainted
-	sink(m.first); // tainted
-	sink(m.first.first); // [FALSE POSITIVE]
-	sink(m.first.second); // tainted
+	sink(m); // tainted [NOT DETECTED]
+	sink(m.first); // tainted [NOT DETECTED]
+	sink(m.first.first);
+	sink(m.first.second); // tainted [NOT DETECTED]
 	sink(m.second);
 }

@@ -102,26 +102,26 @@ void test_map()
 	std::map<char *, char *> m1, m2, m3, m4, m5, m6;

 	sink(m1.insert(std::make_pair("abc", "def")).first);
-	sink(m2.insert(std::make_pair("abc", source())).first); // tainted [NOT DETECTED]
+	sink(m2.insert(std::make_pair("abc", source())).first); // tainted
 	sink(m3.insert(std::make_pair(source(), "def")).first); // tainted [NOT DETECTED]
 	sink(m4.insert(m4.begin(), std::pair<char *, char *>("abc", source()))); // tainted
 	sink(m5.insert_or_assign("abc", source()).first); // tainted
 	sink(m6.insert_or_assign(m6.begin(), "abc", source())); // tainted
 	sink(m1);
 	sink(m2); // tainted
-	sink(m3); // tainted
+	sink(m3); // tainted [NOT DETECTED]
 	sink(m4); // tainted
 	sink(m5); // tainted
 	sink(m6); // tainted
 	sink(m1.find("abc"));
 	sink(m2.find("abc")); // tainted
-	sink(m3.find("abc")); // [FALSE POSITIVE]
+	sink(m3.find("abc"));
 	sink(m4.find("abc")); // tainted
 	sink(m5.find("abc")); // tainted
 	sink(m6.find("abc")); // tainted
 	sink(m1.find("def"));
 	sink(m2.find("def")); // [FALSE POSITIVE]
-	sink(m3.find("def")); // [FALSE POSITIVE]
+	sink(m3.find("def"));
 	sink(m4.find("def")); // [FALSE POSITIVE]
 	sink(m5.find("def")); // [FALSE POSITIVE]
 	sink(m6.find("def")); // [FALSE POSITIVE]
@@ -154,7 +154,7 @@ void test_map()
 	}
 	for (i3 = m3.begin(); i3 != m3.end(); i3++)
 	{
-		sink(*i3); // tainted
+		sink(*i3); // tainted [NOT DETECTED]
 		sink(i2->first); // tainted
 		sink(i2->second); // [FALSE POSITIVE]
 	}
@@ -254,26 +254,26 @@ void test_unordered_map()
 	std::unordered_map<char *, char *> m1, m2, m3, m4, m5, m6;

 	sink(m1.insert(std::make_pair("abc", "def")).first);
-	sink(m2.insert(std::make_pair("abc", source())).first); // tainted [NOT DETECTED]
+	sink(m2.insert(std::make_pair("abc", source())).first); // tainted
 	sink(m3.insert(std::make_pair(source(), "def")).first); // tainted [NOT DETECTED]
 	sink(m4.insert(m4.begin(), std::pair<char *, char *>("abc", source()))); // tainted
 	sink(m5.insert_or_assign("abc", source()).first); // tainted
 	sink(m6.insert_or_assign(m6.begin(), "abc", source())); // tainted
 	sink(m1);
 	sink(m2); // tainted
-	sink(m3); // tainted
+	sink(m3); // tainted [NOT DETECTED]
 	sink(m4); // tainted
 	sink(m5); // tainted
 	sink(m6); // tainted
 	sink(m1.find("abc"));
 	sink(m2.find("abc")); // tainted
-	sink(m3.find("abc")); // [FALSE POSITIVE]
+	sink(m3.find("abc"));
 	sink(m4.find("abc")); // tainted
 	sink(m5.find("abc")); // tainted
 	sink(m6.find("abc")); // tainted
 	sink(m1.find("def"));
 	sink(m2.find("def")); // [FALSE POSITIVE]
-	sink(m3.find("def")); // [FALSE POSITIVE]
+	sink(m3.find("def"));
 	sink(m4.find("def")); // [FALSE POSITIVE]
 	sink(m5.find("def")); // [FALSE POSITIVE]
 	sink(m6.find("def")); // [FALSE POSITIVE]
@@ -306,7 +306,7 @@ void test_unordered_map()
 	}
 	for (i3 = m3.begin(); i3 != m3.end(); i3++)
 	{
-		sink(*i3); // tainted
+		sink(*i3); // tainted [NOT DETECTED]
 		sink(i2->first); // tainted
 		sink(i2->second); // [FALSE POSITIVE]
 	}
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/standalone_iterators.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/standalone_iterators.cpp
@@ -37,15 +37,15 @@ public:
 };

 void test_typedefs(int_iterator_by_typedefs source1) {
-    sink(*source1);
-    sink(*(source1++));
-    sink(*(++source1));
+    sink(*source1); // tainted
+    sink(*(source1++)); // tainted
+    sink(*(++source1)); // tainted
 }

 void test_trait(int_iterator_by_trait source1) {
-    sink(*source1);
-    sink(*(source1++));
-    sink(*(++source1));
+    sink(*source1); // tainted
+    sink(*(source1++)); // tainted
+    sink(*(++source1)); // tainted
 }

 void test_non_iterator(non_iterator source1) {
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
@@ -24,6 +24,12 @@ struct remove_reference<T &&> { typedef T type; };
 template<class T>
 using remove_reference_t = typename remove_reference<T>::type;

+namespace std
+{
+	template<class T> constexpr T&& forward(remove_reference_t<T>& t) noexcept;
+	template<class T> constexpr T&& forward(remove_reference_t<T>&& t) noexcept;
+}
+
 // --- iterator ---

 namespace std {
@@ -338,7 +344,9 @@ namespace std {
 		void swap(pair& p) /*noexcept(...)*/;
 	};

-	template<class T1, class T2> constexpr pair<remove_reference_t<T1>, remove_reference_t<T2>> make_pair(T1&& x, T2&& y);
+	template<class T1, class T2> constexpr pair<remove_reference_t<T1>, remove_reference_t<T2>> make_pair(T1&& x, T2&& y) {
+		return pair<T1, T2>(std::forward<T1>(x), std::forward<T2>(y));
+	}
 }

 // --- map ---
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
@@ -18,6 +18,7 @@ void sink(const char *s);
 void sink(const std::string &s);
 void sink(const char *filename, const char *mode);
 void sink(char);
+void sink(std::string::iterator);

 void test_string()
 {
@@ -349,6 +350,7 @@ void test_string_data_more()
 	sink(str); // tainted
 	sink(str.data()); // tainted
 }
+
 void test_string_iterators() {
 	// string append
 	{
@@ -389,7 +391,7 @@ void test_string_iterators() {
 		string::iterator i1 = s1.begin();

 		string::iterator i2 = s2.begin();
-		string::iterator i3, i4, i5, i6, i7, i8, i9;
+		string::iterator i3, i4, i5, i6, i7, i8, i9, i10, i11;

 		sink(*(i2+1)); //tainted
 		sink(*(i2-1)); // tainted
@@ -411,6 +413,13 @@ void test_string_iterators() {
 		i9 = s2.end();
 		--i9;
 		sink(*i9); // tainted
+
+		i10 = i2;
+		sink(*(i10++)); // tainted
+		sink(i10); // tainted
+		i11 = i2;
+		sink(*(i11--)); // tainted
+		sink(i11); // tainted
 	}
 }

@@ -428,8 +437,6 @@ void test_string_insert_more()
 	sink(s2); // tainted
 }

-void sink(std::string::iterator);
-
 void test_string_iterator_methods()
 {
 	{
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
@@ -36,7 +36,6 @@
 | map.cpp:26:9:26:13 | first | map.cpp:25:12:25:17 | call to source |
 | map.cpp:32:9:32:14 | second | map.cpp:30:13:30:18 | call to source |
 | map.cpp:41:9:41:13 | first | map.cpp:40:30:40:35 | call to source |
-| map.cpp:43:7:43:7 | e | map.cpp:40:30:40:35 | call to source |
 | map.cpp:47:9:47:14 | second | map.cpp:45:37:45:42 | call to source |
 | map.cpp:48:7:48:7 | f | map.cpp:45:37:45:42 | call to source |
 | map.cpp:52:9:52:14 | second | map.cpp:45:37:45:42 | call to source |
@@ -49,23 +48,18 @@
 | map.cpp:74:9:74:14 | second | map.cpp:63:37:63:42 | call to source |
 | map.cpp:75:7:75:7 | k | map.cpp:63:37:63:42 | call to source |
 | map.cpp:78:7:78:7 | l | map.cpp:63:37:63:42 | call to source |
-| map.cpp:83:7:83:32 | call to pair | map.cpp:83:17:83:22 | call to source |
 | map.cpp:86:7:86:32 | call to pair | map.cpp:86:24:86:29 | call to source |
-| map.cpp:92:7:92:7 | call to pair | map.cpp:91:33:91:38 | call to source |
 | map.cpp:107:10:107:15 | call to insert | map.cpp:107:62:107:67 | call to source |
 | map.cpp:109:10:109:25 | call to insert_or_assign | map.cpp:109:46:109:51 | call to source |
 | map.cpp:111:7:111:8 | call to map | map.cpp:105:39:105:44 | call to source |
-| map.cpp:112:7:112:8 | call to map | map.cpp:106:32:106:37 | call to source |
 | map.cpp:113:7:113:8 | call to map | map.cpp:107:62:107:67 | call to source |
 | map.cpp:114:7:114:8 | call to map | map.cpp:108:34:108:39 | call to source |
 | map.cpp:115:7:115:8 | call to map | map.cpp:109:46:109:51 | call to source |
 | map.cpp:117:10:117:13 | call to find | map.cpp:105:39:105:44 | call to source |
-| map.cpp:118:10:118:13 | call to find | map.cpp:106:32:106:37 | call to source |
 | map.cpp:119:10:119:13 | call to find | map.cpp:107:62:107:67 | call to source |
 | map.cpp:120:10:120:13 | call to find | map.cpp:108:34:108:39 | call to source |
 | map.cpp:121:10:121:13 | call to find | map.cpp:109:46:109:51 | call to source |
 | map.cpp:123:10:123:13 | call to find | map.cpp:105:39:105:44 | call to source |
-| map.cpp:124:10:124:13 | call to find | map.cpp:106:32:106:37 | call to source |
 | map.cpp:125:10:125:13 | call to find | map.cpp:107:62:107:67 | call to source |
 | map.cpp:126:10:126:13 | call to find | map.cpp:108:34:108:39 | call to source |
 | map.cpp:127:10:127:13 | call to find | map.cpp:109:46:109:51 | call to source |
@@ -76,61 +70,39 @@
 | map.cpp:138:10:138:13 | call to find | map.cpp:105:39:105:44 | call to source |
 | map.cpp:139:10:139:13 | call to find | map.cpp:105:39:105:44 | call to source |
 | map.cpp:151:8:151:10 | call to pair | map.cpp:105:39:105:44 | call to source |
-| map.cpp:157:8:157:10 | call to pair | map.cpp:106:32:106:37 | call to source |
 | map.cpp:165:7:165:27 | ... = ... | map.cpp:165:20:165:25 | call to source |
 | map.cpp:167:7:167:30 | ... = ... | map.cpp:167:23:167:28 | call to source |
 | map.cpp:169:10:169:10 | call to operator[] | map.cpp:165:20:165:25 | call to source |
 | map.cpp:171:10:171:10 | call to operator[] | map.cpp:167:23:167:28 | call to source |
-| map.cpp:190:7:190:9 | call to map | map.cpp:188:39:188:44 | call to source |
 | map.cpp:190:7:190:9 | call to map | map.cpp:188:49:188:54 | call to source |
-| map.cpp:193:7:193:9 | call to map | map.cpp:189:39:189:44 | call to source |
 | map.cpp:193:7:193:9 | call to map | map.cpp:189:49:189:54 | call to source |
-| map.cpp:196:7:196:9 | call to map | map.cpp:188:39:188:44 | call to source |
 | map.cpp:196:7:196:9 | call to map | map.cpp:188:49:188:54 | call to source |
-| map.cpp:197:7:197:9 | call to map | map.cpp:188:39:188:44 | call to source |
 | map.cpp:197:7:197:9 | call to map | map.cpp:188:49:188:54 | call to source |
-| map.cpp:198:7:198:9 | call to map | map.cpp:189:39:189:44 | call to source |
 | map.cpp:198:7:198:9 | call to map | map.cpp:189:49:189:54 | call to source |
-| map.cpp:199:7:199:9 | call to map | map.cpp:189:39:189:44 | call to source |
 | map.cpp:199:7:199:9 | call to map | map.cpp:189:49:189:54 | call to source |
-| map.cpp:207:7:207:9 | call to map | map.cpp:203:39:203:44 | call to source |
 | map.cpp:207:7:207:9 | call to map | map.cpp:203:49:203:54 | call to source |
-| map.cpp:210:7:210:9 | call to map | map.cpp:206:39:206:44 | call to source |
 | map.cpp:210:7:210:9 | call to map | map.cpp:206:49:206:54 | call to source |
-| map.cpp:213:7:213:9 | call to map | map.cpp:203:39:203:44 | call to source |
 | map.cpp:213:7:213:9 | call to map | map.cpp:203:49:203:54 | call to source |
-| map.cpp:216:7:216:9 | call to map | map.cpp:206:39:206:44 | call to source |
 | map.cpp:216:7:216:9 | call to map | map.cpp:206:49:206:54 | call to source |
-| map.cpp:222:7:222:9 | call to map | map.cpp:220:39:220:44 | call to source |
 | map.cpp:222:7:222:9 | call to map | map.cpp:220:49:220:54 | call to source |
-| map.cpp:222:7:222:9 | call to map | map.cpp:221:39:221:44 | call to source |
 | map.cpp:222:7:222:9 | call to map | map.cpp:221:49:221:54 | call to source |
-| map.cpp:223:11:223:15 | call to erase | map.cpp:220:39:220:44 | call to source |
 | map.cpp:223:11:223:15 | call to erase | map.cpp:220:49:220:54 | call to source |
-| map.cpp:223:11:223:15 | call to erase | map.cpp:221:39:221:44 | call to source |
 | map.cpp:223:11:223:15 | call to erase | map.cpp:221:49:221:54 | call to source |
-| map.cpp:224:7:224:9 | call to map | map.cpp:220:39:220:44 | call to source |
 | map.cpp:224:7:224:9 | call to map | map.cpp:220:49:220:54 | call to source |
-| map.cpp:224:7:224:9 | call to map | map.cpp:221:39:221:44 | call to source |
 | map.cpp:224:7:224:9 | call to map | map.cpp:221:49:221:54 | call to source |
-| map.cpp:226:7:226:9 | call to map | map.cpp:220:39:220:44 | call to source |
 | map.cpp:226:7:226:9 | call to map | map.cpp:220:49:220:54 | call to source |
-| map.cpp:226:7:226:9 | call to map | map.cpp:221:39:221:44 | call to source |
 | map.cpp:226:7:226:9 | call to map | map.cpp:221:49:221:54 | call to source |
 | map.cpp:259:10:259:15 | call to insert | map.cpp:259:62:259:67 | call to source |
 | map.cpp:261:10:261:25 | call to insert_or_assign | map.cpp:261:46:261:51 | call to source |
 | map.cpp:263:7:263:8 | call to unordered_map | map.cpp:257:39:257:44 | call to source |
-| map.cpp:264:7:264:8 | call to unordered_map | map.cpp:258:32:258:37 | call to source |
 | map.cpp:265:7:265:8 | call to unordered_map | map.cpp:259:62:259:67 | call to source |
 | map.cpp:266:7:266:8 | call to unordered_map | map.cpp:260:34:260:39 | call to source |
 | map.cpp:267:7:267:8 | call to unordered_map | map.cpp:261:46:261:51 | call to source |
 | map.cpp:269:10:269:13 | call to find | map.cpp:257:39:257:44 | call to source |
-| map.cpp:270:10:270:13 | call to find | map.cpp:258:32:258:37 | call to source |
 | map.cpp:271:10:271:13 | call to find | map.cpp:259:62:259:67 | call to source |
 | map.cpp:272:10:272:13 | call to find | map.cpp:260:34:260:39 | call to source |
 | map.cpp:273:10:273:13 | call to find | map.cpp:261:46:261:51 | call to source |
 | map.cpp:275:10:275:13 | call to find | map.cpp:257:39:257:44 | call to source |
-| map.cpp:276:10:276:13 | call to find | map.cpp:258:32:258:37 | call to source |
 | map.cpp:277:10:277:13 | call to find | map.cpp:259:62:259:67 | call to source |
 | map.cpp:278:10:278:13 | call to find | map.cpp:260:34:260:39 | call to source |
 | map.cpp:279:10:279:13 | call to find | map.cpp:261:46:261:51 | call to source |
@@ -141,46 +113,27 @@
 | map.cpp:290:10:290:13 | call to find | map.cpp:257:39:257:44 | call to source |
 | map.cpp:291:10:291:13 | call to find | map.cpp:257:39:257:44 | call to source |
 | map.cpp:303:8:303:10 | call to pair | map.cpp:257:39:257:44 | call to source |
-| map.cpp:309:8:309:10 | call to pair | map.cpp:258:32:258:37 | call to source |
 | map.cpp:317:7:317:27 | ... = ... | map.cpp:317:20:317:25 | call to source |
 | map.cpp:319:7:319:30 | ... = ... | map.cpp:319:23:319:28 | call to source |
 | map.cpp:321:10:321:10 | call to operator[] | map.cpp:317:20:317:25 | call to source |
 | map.cpp:323:10:323:10 | call to operator[] | map.cpp:319:23:319:28 | call to source |
-| map.cpp:339:7:339:9 | call to unordered_map | map.cpp:337:39:337:44 | call to source |
 | map.cpp:339:7:339:9 | call to unordered_map | map.cpp:337:49:337:54 | call to source |
-| map.cpp:342:7:342:9 | call to unordered_map | map.cpp:338:39:338:44 | call to source |
 | map.cpp:342:7:342:9 | call to unordered_map | map.cpp:338:49:338:54 | call to source |
-| map.cpp:345:7:345:9 | call to unordered_map | map.cpp:337:39:337:44 | call to source |
 | map.cpp:345:7:345:9 | call to unordered_map | map.cpp:337:49:337:54 | call to source |
-| map.cpp:346:7:346:9 | call to unordered_map | map.cpp:337:39:337:44 | call to source |
 | map.cpp:346:7:346:9 | call to unordered_map | map.cpp:337:49:337:54 | call to source |
-| map.cpp:347:7:347:9 | call to unordered_map | map.cpp:338:39:338:44 | call to source |
 | map.cpp:347:7:347:9 | call to unordered_map | map.cpp:338:49:338:54 | call to source |
-| map.cpp:348:7:348:9 | call to unordered_map | map.cpp:338:39:338:44 | call to source |
 | map.cpp:348:7:348:9 | call to unordered_map | map.cpp:338:49:338:54 | call to source |
-| map.cpp:356:7:356:9 | call to unordered_map | map.cpp:352:39:352:44 | call to source |
 | map.cpp:356:7:356:9 | call to unordered_map | map.cpp:352:49:352:54 | call to source |
-| map.cpp:359:7:359:9 | call to unordered_map | map.cpp:355:39:355:44 | call to source |
 | map.cpp:359:7:359:9 | call to unordered_map | map.cpp:355:49:355:54 | call to source |
-| map.cpp:362:7:362:9 | call to unordered_map | map.cpp:352:39:352:44 | call to source |
 | map.cpp:362:7:362:9 | call to unordered_map | map.cpp:352:49:352:54 | call to source |
-| map.cpp:365:7:365:9 | call to unordered_map | map.cpp:355:39:355:44 | call to source |
 | map.cpp:365:7:365:9 | call to unordered_map | map.cpp:355:49:355:54 | call to source |
-| map.cpp:371:7:371:9 | call to unordered_map | map.cpp:369:39:369:44 | call to source |
 | map.cpp:371:7:371:9 | call to unordered_map | map.cpp:369:49:369:54 | call to source |
-| map.cpp:371:7:371:9 | call to unordered_map | map.cpp:370:39:370:44 | call to source |
 | map.cpp:371:7:371:9 | call to unordered_map | map.cpp:370:49:370:54 | call to source |
-| map.cpp:372:11:372:15 | call to erase | map.cpp:369:39:369:44 | call to source |
 | map.cpp:372:11:372:15 | call to erase | map.cpp:369:49:369:54 | call to source |
-| map.cpp:372:11:372:15 | call to erase | map.cpp:370:39:370:44 | call to source |
 | map.cpp:372:11:372:15 | call to erase | map.cpp:370:49:370:54 | call to source |
-| map.cpp:373:7:373:9 | call to unordered_map | map.cpp:369:39:369:44 | call to source |
 | map.cpp:373:7:373:9 | call to unordered_map | map.cpp:369:49:369:54 | call to source |
-| map.cpp:373:7:373:9 | call to unordered_map | map.cpp:370:39:370:44 | call to source |
 | map.cpp:373:7:373:9 | call to unordered_map | map.cpp:370:49:370:54 | call to source |
-| map.cpp:375:7:375:9 | call to unordered_map | map.cpp:369:39:369:44 | call to source |
 | map.cpp:375:7:375:9 | call to unordered_map | map.cpp:369:49:369:54 | call to source |
-| map.cpp:375:7:375:9 | call to unordered_map | map.cpp:370:39:370:44 | call to source |
 | map.cpp:375:7:375:9 | call to unordered_map | map.cpp:370:49:370:54 | call to source |
 | movableclass.cpp:44:8:44:9 | s1 | movableclass.cpp:39:21:39:26 | call to source |
 | movableclass.cpp:45:8:45:9 | s2 | movableclass.cpp:40:23:40:28 | call to source |
@@ -269,119 +222,123 @@
 | standalone_iterators.cpp:46:10:46:10 | call to operator* | standalone_iterators.cpp:45:39:45:45 | source1 |
 | standalone_iterators.cpp:47:10:47:10 | call to operator* | standalone_iterators.cpp:45:39:45:45 | source1 |
 | standalone_iterators.cpp:48:10:48:10 | call to operator* | standalone_iterators.cpp:45:39:45:45 | source1 |
-| string.cpp:28:7:28:7 | a | string.cpp:24:12:24:17 | call to source |
-| string.cpp:30:7:30:7 | c | string.cpp:26:16:26:21 | call to source |
-| string.cpp:32:9:32:13 | call to c_str | string.cpp:26:16:26:21 | call to source |
-| string.cpp:38:13:38:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
-| string.cpp:42:13:42:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
-| string.cpp:45:13:45:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
-| string.cpp:55:7:55:8 | cs | string.cpp:50:19:50:24 | call to source |
-| string.cpp:56:7:56:8 | ss | string.cpp:50:19:50:24 | call to source |
-| string.cpp:69:7:69:8 | cs | string.cpp:61:19:61:24 | call to source |
-| string.cpp:70:7:70:8 | ss | string.cpp:61:19:61:24 | call to source |
-| string.cpp:92:8:92:9 | s1 | string.cpp:87:18:87:23 | call to source |
-| string.cpp:93:8:93:9 | s2 | string.cpp:88:20:88:25 | call to source |
-| string.cpp:94:8:94:9 | s3 | string.cpp:90:8:90:13 | call to source |
-| string.cpp:113:8:113:9 | s1 | string.cpp:109:32:109:37 | call to source |
-| string.cpp:114:8:114:9 | s2 | string.cpp:111:20:111:25 | call to source |
-| string.cpp:121:8:121:8 | c | string.cpp:119:16:119:21 | call to source |
-| string.cpp:125:8:125:8 | call to operator* | string.cpp:119:16:119:21 | call to source |
-| string.cpp:129:8:129:8 | c | string.cpp:119:16:119:21 | call to source |
-| string.cpp:134:8:134:8 | c | string.cpp:132:28:132:33 | call to source |
-| string.cpp:144:11:144:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:145:11:145:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:146:11:146:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:149:11:149:11 | call to operator+ | string.cpp:149:13:149:18 | call to source |
-| string.cpp:158:8:158:9 | s5 | string.cpp:154:18:154:23 | call to source |
-| string.cpp:161:11:161:11 | call to operator+= | string.cpp:154:18:154:23 | call to source |
-| string.cpp:162:8:162:9 | s6 | string.cpp:154:18:154:23 | call to source |
-| string.cpp:165:11:165:11 | call to operator+= | string.cpp:165:14:165:19 | call to source |
-| string.cpp:166:11:166:11 | call to operator+= | string.cpp:165:14:165:19 | call to source |
-| string.cpp:167:8:167:9 | s7 | string.cpp:165:14:165:19 | call to source |
-| string.cpp:171:8:171:9 | s8 | string.cpp:154:18:154:23 | call to source |
-| string.cpp:176:8:176:9 | s9 | string.cpp:174:13:174:18 | call to source |
-| string.cpp:184:8:184:10 | s10 | string.cpp:181:12:181:26 | call to source |
-| string.cpp:198:10:198:15 | call to assign | string.cpp:190:17:190:22 | call to source |
-| string.cpp:199:7:199:8 | s4 | string.cpp:190:17:190:22 | call to source |
-| string.cpp:201:10:201:15 | call to assign | string.cpp:191:11:191:25 | call to source |
-| string.cpp:202:7:202:8 | s5 | string.cpp:191:11:191:25 | call to source |
-| string.cpp:205:7:205:8 | s6 | string.cpp:193:17:193:22 | call to source |
-| string.cpp:219:10:219:15 | call to insert | string.cpp:210:17:210:22 | call to source |
-| string.cpp:220:7:220:8 | s4 | string.cpp:210:17:210:22 | call to source |
-| string.cpp:223:10:223:15 | call to insert | string.cpp:210:17:210:22 | call to source |
-| string.cpp:224:7:224:8 | s5 | string.cpp:210:17:210:22 | call to source |
-| string.cpp:227:10:227:15 | call to insert | string.cpp:211:11:211:25 | call to source |
-| string.cpp:228:7:228:8 | s6 | string.cpp:211:11:211:25 | call to source |
-| string.cpp:242:10:242:16 | call to replace | string.cpp:233:17:233:22 | call to source |
-| string.cpp:243:7:243:8 | s4 | string.cpp:233:17:233:22 | call to source |
-| string.cpp:246:10:246:16 | call to replace | string.cpp:233:17:233:22 | call to source |
-| string.cpp:247:7:247:8 | s5 | string.cpp:233:17:233:22 | call to source |
-| string.cpp:250:10:250:16 | call to replace | string.cpp:234:11:234:25 | call to source |
-| string.cpp:251:7:251:8 | s6 | string.cpp:234:11:234:25 | call to source |
-| string.cpp:264:7:264:8 | b2 | string.cpp:258:17:258:22 | call to source |
-| string.cpp:274:7:274:8 | s2 | string.cpp:269:17:269:22 | call to source |
-| string.cpp:276:7:276:8 | s4 | string.cpp:271:17:271:22 | call to source |
-| string.cpp:281:7:281:8 | s1 | string.cpp:269:17:269:22 | call to source |
-| string.cpp:282:7:282:8 | s2 | string.cpp:269:17:269:22 | call to source |
-| string.cpp:283:7:283:8 | s3 | string.cpp:271:17:271:22 | call to source |
-| string.cpp:284:7:284:8 | s4 | string.cpp:271:17:271:22 | call to source |
-| string.cpp:292:7:292:8 | s1 | string.cpp:288:17:288:22 | call to source |
-| string.cpp:293:7:293:8 | s2 | string.cpp:289:17:289:22 | call to source |
-| string.cpp:294:7:294:8 | s3 | string.cpp:290:17:290:22 | call to source |
-| string.cpp:300:7:300:8 | s1 | string.cpp:288:17:288:22 | call to source |
-| string.cpp:302:7:302:8 | s3 | string.cpp:290:17:290:22 | call to source |
-| string.cpp:311:9:311:12 | call to data | string.cpp:308:16:308:21 | call to source |
-| string.cpp:322:9:322:14 | call to substr | string.cpp:319:16:319:21 | call to source |
-| string.cpp:339:7:339:7 | a | string.cpp:335:9:335:23 | call to source |
-| string.cpp:340:7:340:7 | b | string.cpp:336:12:336:26 | call to source |
-| string.cpp:341:7:341:7 | c | string.cpp:335:9:335:23 | call to source |
-| string.cpp:349:7:349:9 | str | string.cpp:348:18:348:32 | call to source |
-| string.cpp:350:11:350:14 | call to data | string.cpp:348:18:348:32 | call to source |
-| string.cpp:361:11:361:16 | call to append | string.cpp:356:18:356:23 | call to source |
-| string.cpp:362:8:362:9 | s1 | string.cpp:356:18:356:23 | call to source |
-| string.cpp:380:8:380:8 | call to operator* | string.cpp:372:18:372:23 | call to source |
-| string.cpp:381:13:381:13 | call to operator[] | string.cpp:372:18:372:23 | call to source |
-| string.cpp:394:8:394:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:395:8:395:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:397:8:397:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:399:8:399:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:402:8:402:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:405:8:405:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:407:8:407:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:409:8:409:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:413:8:413:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:427:10:427:15 | call to insert | string.cpp:422:14:422:19 | call to source |
-| string.cpp:428:7:428:8 | s2 | string.cpp:422:14:422:19 | call to source |
-| string.cpp:442:10:442:15 | call to insert | string.cpp:442:32:442:46 | call to source |
-| string.cpp:443:8:443:8 | b | string.cpp:442:32:442:46 | call to source |
-| string.cpp:455:10:455:15 | call to insert | string.cpp:450:18:450:23 | call to source |
-| string.cpp:456:8:456:8 | d | string.cpp:450:18:450:23 | call to source |
-| string.cpp:458:11:458:16 | call to insert | string.cpp:450:18:450:23 | call to source |
-| string.cpp:459:8:459:9 | s2 | string.cpp:450:18:450:23 | call to source |
-| string.cpp:471:10:471:15 | call to append | string.cpp:466:18:466:23 | call to source |
-| string.cpp:472:8:472:8 | f | string.cpp:466:18:466:23 | call to source |
-| string.cpp:474:11:474:16 | call to append | string.cpp:466:18:466:23 | call to source |
-| string.cpp:475:8:475:9 | s4 | string.cpp:466:18:466:23 | call to source |
-| string.cpp:487:10:487:15 | call to assign | string.cpp:482:18:482:23 | call to source |
-| string.cpp:488:8:488:8 | h | string.cpp:482:18:482:23 | call to source |
-| string.cpp:491:8:491:9 | s6 | string.cpp:482:18:482:23 | call to source |
-| string.cpp:504:7:504:8 | s2 | string.cpp:497:14:497:19 | call to source |
-| string.cpp:506:7:506:8 | s4 | string.cpp:497:14:497:19 | call to source |
-| string.cpp:515:9:515:13 | call to front | string.cpp:514:14:514:28 | call to source |
-| string.cpp:516:9:516:12 | call to back | string.cpp:514:14:514:28 | call to source |
-| string.cpp:529:11:529:11 | call to operator+= | string.cpp:529:20:529:25 | call to source |
-| string.cpp:530:21:530:21 | call to operator+= | string.cpp:530:24:530:29 | call to source |
-| string.cpp:531:25:531:25 | call to operator+= | string.cpp:531:15:531:20 | call to source |
-| string.cpp:534:8:534:8 | c | string.cpp:529:20:529:25 | call to source |
-| string.cpp:535:8:535:8 | d | string.cpp:529:20:529:25 | call to source |
-| string.cpp:536:8:536:8 | e | string.cpp:530:24:530:29 | call to source |
-| string.cpp:537:8:537:8 | f | string.cpp:531:15:531:20 | call to source |
-| string.cpp:549:11:549:16 | call to assign | string.cpp:549:27:549:32 | call to source |
-| string.cpp:550:24:550:29 | call to assign | string.cpp:550:31:550:36 | call to source |
-| string.cpp:554:8:554:8 | c | string.cpp:549:27:549:32 | call to source |
-| string.cpp:555:8:555:8 | d | string.cpp:549:27:549:32 | call to source |
-| string.cpp:556:8:556:8 | e | string.cpp:550:31:550:36 | call to source |
-| string.cpp:557:8:557:8 | f | string.cpp:551:18:551:23 | call to source |
+| string.cpp:29:7:29:7 | a | string.cpp:25:12:25:17 | call to source |
+| string.cpp:31:7:31:7 | c | string.cpp:27:16:27:21 | call to source |
+| string.cpp:33:9:33:13 | call to c_str | string.cpp:27:16:27:21 | call to source |
+| string.cpp:39:13:39:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
+| string.cpp:43:13:43:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
+| string.cpp:46:13:46:17 | call to c_str | string.cpp:14:10:14:15 | call to source |
+| string.cpp:56:7:56:8 | cs | string.cpp:51:19:51:24 | call to source |
+| string.cpp:57:7:57:8 | ss | string.cpp:51:19:51:24 | call to source |
+| string.cpp:70:7:70:8 | cs | string.cpp:62:19:62:24 | call to source |
+| string.cpp:71:7:71:8 | ss | string.cpp:62:19:62:24 | call to source |
+| string.cpp:93:8:93:9 | s1 | string.cpp:88:18:88:23 | call to source |
+| string.cpp:94:8:94:9 | s2 | string.cpp:89:20:89:25 | call to source |
+| string.cpp:95:8:95:9 | s3 | string.cpp:91:8:91:13 | call to source |
+| string.cpp:114:8:114:9 | s1 | string.cpp:110:32:110:37 | call to source |
+| string.cpp:115:8:115:9 | s2 | string.cpp:112:20:112:25 | call to source |
+| string.cpp:122:8:122:8 | c | string.cpp:120:16:120:21 | call to source |
+| string.cpp:126:8:126:8 | call to operator* | string.cpp:120:16:120:21 | call to source |
+| string.cpp:130:8:130:8 | c | string.cpp:120:16:120:21 | call to source |
+| string.cpp:135:8:135:8 | c | string.cpp:133:28:133:33 | call to source |
+| string.cpp:145:11:145:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:146:11:146:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:147:11:147:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:150:11:150:11 | call to operator+ | string.cpp:150:13:150:18 | call to source |
+| string.cpp:159:8:159:9 | s5 | string.cpp:155:18:155:23 | call to source |
+| string.cpp:162:11:162:11 | call to operator+= | string.cpp:155:18:155:23 | call to source |
+| string.cpp:163:8:163:9 | s6 | string.cpp:155:18:155:23 | call to source |
+| string.cpp:166:11:166:11 | call to operator+= | string.cpp:166:14:166:19 | call to source |
+| string.cpp:167:11:167:11 | call to operator+= | string.cpp:166:14:166:19 | call to source |
+| string.cpp:168:8:168:9 | s7 | string.cpp:166:14:166:19 | call to source |
+| string.cpp:172:8:172:9 | s8 | string.cpp:155:18:155:23 | call to source |
+| string.cpp:177:8:177:9 | s9 | string.cpp:175:13:175:18 | call to source |
+| string.cpp:185:8:185:10 | s10 | string.cpp:182:12:182:26 | call to source |
+| string.cpp:199:10:199:15 | call to assign | string.cpp:191:17:191:22 | call to source |
+| string.cpp:200:7:200:8 | s4 | string.cpp:191:17:191:22 | call to source |
+| string.cpp:202:10:202:15 | call to assign | string.cpp:192:11:192:25 | call to source |
+| string.cpp:203:7:203:8 | s5 | string.cpp:192:11:192:25 | call to source |
+| string.cpp:206:7:206:8 | s6 | string.cpp:194:17:194:22 | call to source |
+| string.cpp:220:10:220:15 | call to insert | string.cpp:211:17:211:22 | call to source |
+| string.cpp:221:7:221:8 | s4 | string.cpp:211:17:211:22 | call to source |
+| string.cpp:224:10:224:15 | call to insert | string.cpp:211:17:211:22 | call to source |
+| string.cpp:225:7:225:8 | s5 | string.cpp:211:17:211:22 | call to source |
+| string.cpp:228:10:228:15 | call to insert | string.cpp:212:11:212:25 | call to source |
+| string.cpp:229:7:229:8 | s6 | string.cpp:212:11:212:25 | call to source |
+| string.cpp:243:10:243:16 | call to replace | string.cpp:234:17:234:22 | call to source |
+| string.cpp:244:7:244:8 | s4 | string.cpp:234:17:234:22 | call to source |
+| string.cpp:247:10:247:16 | call to replace | string.cpp:234:17:234:22 | call to source |
+| string.cpp:248:7:248:8 | s5 | string.cpp:234:17:234:22 | call to source |
+| string.cpp:251:10:251:16 | call to replace | string.cpp:235:11:235:25 | call to source |
+| string.cpp:252:7:252:8 | s6 | string.cpp:235:11:235:25 | call to source |
+| string.cpp:265:7:265:8 | b2 | string.cpp:259:17:259:22 | call to source |
+| string.cpp:275:7:275:8 | s2 | string.cpp:270:17:270:22 | call to source |
+| string.cpp:277:7:277:8 | s4 | string.cpp:272:17:272:22 | call to source |
+| string.cpp:282:7:282:8 | s1 | string.cpp:270:17:270:22 | call to source |
+| string.cpp:283:7:283:8 | s2 | string.cpp:270:17:270:22 | call to source |
+| string.cpp:284:7:284:8 | s3 | string.cpp:272:17:272:22 | call to source |
+| string.cpp:285:7:285:8 | s4 | string.cpp:272:17:272:22 | call to source |
+| string.cpp:293:7:293:8 | s1 | string.cpp:289:17:289:22 | call to source |
+| string.cpp:294:7:294:8 | s2 | string.cpp:290:17:290:22 | call to source |
+| string.cpp:295:7:295:8 | s3 | string.cpp:291:17:291:22 | call to source |
+| string.cpp:301:7:301:8 | s1 | string.cpp:289:17:289:22 | call to source |
+| string.cpp:303:7:303:8 | s3 | string.cpp:291:17:291:22 | call to source |
+| string.cpp:312:9:312:12 | call to data | string.cpp:309:16:309:21 | call to source |
+| string.cpp:323:9:323:14 | call to substr | string.cpp:320:16:320:21 | call to source |
+| string.cpp:340:7:340:7 | a | string.cpp:336:9:336:23 | call to source |
+| string.cpp:341:7:341:7 | b | string.cpp:337:12:337:26 | call to source |
+| string.cpp:342:7:342:7 | c | string.cpp:336:9:336:23 | call to source |
+| string.cpp:350:7:350:9 | str | string.cpp:349:18:349:32 | call to source |
+| string.cpp:351:11:351:14 | call to data | string.cpp:349:18:349:32 | call to source |
+| string.cpp:363:11:363:16 | call to append | string.cpp:358:18:358:23 | call to source |
+| string.cpp:364:8:364:9 | s1 | string.cpp:358:18:358:23 | call to source |
+| string.cpp:382:8:382:8 | call to operator* | string.cpp:374:18:374:23 | call to source |
+| string.cpp:383:13:383:13 | call to operator[] | string.cpp:374:18:374:23 | call to source |
+| string.cpp:396:8:396:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:397:8:397:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:399:8:399:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:401:8:401:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:404:8:404:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:407:8:407:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:409:8:409:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:411:8:411:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:415:8:415:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:418:8:418:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:419:8:419:10 | call to iterator | string.cpp:389:18:389:23 | call to source |
+| string.cpp:421:8:421:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:422:8:422:10 | call to iterator | string.cpp:389:18:389:23 | call to source |
+| string.cpp:436:10:436:15 | call to insert | string.cpp:431:14:431:19 | call to source |
+| string.cpp:437:7:437:8 | s2 | string.cpp:431:14:431:19 | call to source |
+| string.cpp:449:10:449:15 | call to insert | string.cpp:449:32:449:46 | call to source |
+| string.cpp:450:8:450:8 | b | string.cpp:449:32:449:46 | call to source |
+| string.cpp:462:10:462:15 | call to insert | string.cpp:457:18:457:23 | call to source |
+| string.cpp:463:8:463:8 | d | string.cpp:457:18:457:23 | call to source |
+| string.cpp:465:11:465:16 | call to insert | string.cpp:457:18:457:23 | call to source |
+| string.cpp:466:8:466:9 | s2 | string.cpp:457:18:457:23 | call to source |
+| string.cpp:478:10:478:15 | call to append | string.cpp:473:18:473:23 | call to source |
+| string.cpp:479:8:479:8 | f | string.cpp:473:18:473:23 | call to source |
+| string.cpp:481:11:481:16 | call to append | string.cpp:473:18:473:23 | call to source |
+| string.cpp:482:8:482:9 | s4 | string.cpp:473:18:473:23 | call to source |
+| string.cpp:494:10:494:15 | call to assign | string.cpp:489:18:489:23 | call to source |
+| string.cpp:495:8:495:8 | h | string.cpp:489:18:489:23 | call to source |
+| string.cpp:498:8:498:9 | s6 | string.cpp:489:18:489:23 | call to source |
+| string.cpp:511:7:511:8 | s2 | string.cpp:504:14:504:19 | call to source |
+| string.cpp:513:7:513:8 | s4 | string.cpp:504:14:504:19 | call to source |
+| string.cpp:522:9:522:13 | call to front | string.cpp:521:14:521:28 | call to source |
+| string.cpp:523:9:523:12 | call to back | string.cpp:521:14:521:28 | call to source |
+| string.cpp:536:11:536:11 | call to operator+= | string.cpp:536:20:536:25 | call to source |
+| string.cpp:537:21:537:21 | call to operator+= | string.cpp:537:24:537:29 | call to source |
+| string.cpp:538:25:538:25 | call to operator+= | string.cpp:538:15:538:20 | call to source |
+| string.cpp:541:8:541:8 | c | string.cpp:536:20:536:25 | call to source |
+| string.cpp:542:8:542:8 | d | string.cpp:536:20:536:25 | call to source |
+| string.cpp:543:8:543:8 | e | string.cpp:537:24:537:29 | call to source |
+| string.cpp:544:8:544:8 | f | string.cpp:538:15:538:20 | call to source |
+| string.cpp:556:11:556:16 | call to assign | string.cpp:556:27:556:32 | call to source |
+| string.cpp:557:24:557:29 | call to assign | string.cpp:557:31:557:36 | call to source |
+| string.cpp:561:8:561:8 | c | string.cpp:556:27:556:32 | call to source |
+| string.cpp:562:8:562:8 | d | string.cpp:556:27:556:32 | call to source |
+| string.cpp:563:8:563:8 | e | string.cpp:557:31:557:36 | call to source |
+| string.cpp:564:8:564:8 | f | string.cpp:558:18:558:23 | call to source |
 | stringstream.cpp:32:11:32:11 | call to operator<< | stringstream.cpp:32:14:32:19 | call to source |
 | stringstream.cpp:33:20:33:20 | call to operator<< | stringstream.cpp:33:23:33:28 | call to source |
 | stringstream.cpp:34:23:34:23 | call to operator<< | stringstream.cpp:34:14:34:19 | call to source |
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected
@@ -17,7 +17,6 @@
 | copyableclass.cpp:67:11:67:21 | copyableclass.cpp:67:13:67:18 | IR only |
 | copyableclass_declonly.cpp:42:8:42:9 | copyableclass_declonly.cpp:34:30:34:35 | AST only |
 | copyableclass_declonly.cpp:67:11:67:11 | copyableclass_declonly.cpp:67:13:67:18 | AST only |
-| map.cpp:42:9:42:14 | map.cpp:40:30:40:35 | IR only |
 | map.cpp:46:9:46:13 | map.cpp:45:37:45:42 | IR only |
 | map.cpp:51:9:51:13 | map.cpp:45:37:45:42 | IR only |
 | map.cpp:57:9:57:13 | map.cpp:45:37:45:42 | IR only |
@@ -27,20 +26,11 @@
 | map.cpp:73:9:73:13 | map.cpp:63:37:63:42 | IR only |
 | map.cpp:76:9:76:13 | map.cpp:63:37:63:42 | IR only |
 | map.cpp:77:9:77:14 | map.cpp:63:37:63:42 | IR only |
-| map.cpp:84:34:84:38 | map.cpp:84:17:84:22 | IR only |
-| map.cpp:85:34:85:39 | map.cpp:85:17:85:22 | IR only |
 | map.cpp:87:34:87:38 | map.cpp:87:24:87:29 | IR only |
 | map.cpp:88:34:88:39 | map.cpp:88:24:88:29 | IR only |
-| map.cpp:92:7:92:7 | map.cpp:91:33:91:38 | AST only |
-| map.cpp:93:9:93:13 | map.cpp:91:33:91:38 | IR only |
-| map.cpp:94:15:94:19 | map.cpp:91:33:91:38 | IR only |
-| map.cpp:95:15:95:20 | map.cpp:91:33:91:38 | IR only |
-| map.cpp:96:9:96:14 | map.cpp:91:33:91:38 | IR only |
 | map.cpp:105:7:105:54 | map.cpp:105:39:105:44 | IR only |
-| map.cpp:106:7:106:54 | map.cpp:106:32:106:37 | IR only |
 | map.cpp:108:7:108:48 | map.cpp:108:34:108:39 | IR only |
 | map.cpp:111:7:111:8 | map.cpp:105:39:105:44 | AST only |
-| map.cpp:112:7:112:8 | map.cpp:106:32:106:37 | AST only |
 | map.cpp:113:7:113:8 | map.cpp:107:62:107:67 | AST only |
 | map.cpp:114:7:114:8 | map.cpp:108:34:108:39 | AST only |
 | map.cpp:115:7:115:8 | map.cpp:109:46:109:51 | AST only |
@@ -59,43 +49,25 @@
 | map.cpp:159:12:159:17 | map.cpp:105:39:105:44 | IR only |
 | map.cpp:169:10:169:10 | map.cpp:165:20:165:25 | AST only |
 | map.cpp:171:10:171:10 | map.cpp:167:23:167:28 | AST only |
-| map.cpp:190:7:190:9 | map.cpp:188:39:188:44 | AST only |
 | map.cpp:190:7:190:9 | map.cpp:188:49:188:54 | AST only |
-| map.cpp:193:7:193:9 | map.cpp:189:39:189:44 | AST only |
 | map.cpp:193:7:193:9 | map.cpp:189:49:189:54 | AST only |
-| map.cpp:196:7:196:9 | map.cpp:188:39:188:44 | AST only |
 | map.cpp:196:7:196:9 | map.cpp:188:49:188:54 | AST only |
-| map.cpp:197:7:197:9 | map.cpp:188:39:188:44 | AST only |
 | map.cpp:197:7:197:9 | map.cpp:188:49:188:54 | AST only |
-| map.cpp:198:7:198:9 | map.cpp:189:39:189:44 | AST only |
 | map.cpp:198:7:198:9 | map.cpp:189:49:189:54 | AST only |
-| map.cpp:199:7:199:9 | map.cpp:189:39:189:44 | AST only |
 | map.cpp:199:7:199:9 | map.cpp:189:49:189:54 | AST only |
-| map.cpp:207:7:207:9 | map.cpp:203:39:203:44 | AST only |
 | map.cpp:207:7:207:9 | map.cpp:203:49:203:54 | AST only |
-| map.cpp:210:7:210:9 | map.cpp:206:39:206:44 | AST only |
 | map.cpp:210:7:210:9 | map.cpp:206:49:206:54 | AST only |
-| map.cpp:213:7:213:9 | map.cpp:203:39:203:44 | AST only |
 | map.cpp:213:7:213:9 | map.cpp:203:49:203:54 | AST only |
-| map.cpp:216:7:216:9 | map.cpp:206:39:206:44 | AST only |
 | map.cpp:216:7:216:9 | map.cpp:206:49:206:54 | AST only |
-| map.cpp:222:7:222:9 | map.cpp:220:39:220:44 | AST only |
 | map.cpp:222:7:222:9 | map.cpp:220:49:220:54 | AST only |
-| map.cpp:222:7:222:9 | map.cpp:221:39:221:44 | AST only |
 | map.cpp:222:7:222:9 | map.cpp:221:49:221:54 | AST only |
-| map.cpp:224:7:224:9 | map.cpp:220:39:220:44 | AST only |
 | map.cpp:224:7:224:9 | map.cpp:220:49:220:54 | AST only |
-| map.cpp:224:7:224:9 | map.cpp:221:39:221:44 | AST only |
 | map.cpp:224:7:224:9 | map.cpp:221:49:221:54 | AST only |
-| map.cpp:226:7:226:9 | map.cpp:220:39:220:44 | AST only |
 | map.cpp:226:7:226:9 | map.cpp:220:49:220:54 | AST only |
-| map.cpp:226:7:226:9 | map.cpp:221:39:221:44 | AST only |
 | map.cpp:226:7:226:9 | map.cpp:221:49:221:54 | AST only |
 | map.cpp:257:7:257:54 | map.cpp:257:39:257:44 | IR only |
-| map.cpp:258:7:258:54 | map.cpp:258:32:258:37 | IR only |
 | map.cpp:260:7:260:48 | map.cpp:260:34:260:39 | IR only |
 | map.cpp:263:7:263:8 | map.cpp:257:39:257:44 | AST only |
-| map.cpp:264:7:264:8 | map.cpp:258:32:258:37 | AST only |
 | map.cpp:265:7:265:8 | map.cpp:259:62:259:67 | AST only |
 | map.cpp:266:7:266:8 | map.cpp:260:34:260:39 | AST only |
 | map.cpp:267:7:267:8 | map.cpp:261:46:261:51 | AST only |
@@ -114,37 +86,21 @@
 | map.cpp:311:12:311:17 | map.cpp:257:39:257:44 | IR only |
 | map.cpp:321:10:321:10 | map.cpp:317:20:317:25 | AST only |
 | map.cpp:323:10:323:10 | map.cpp:319:23:319:28 | AST only |
-| map.cpp:339:7:339:9 | map.cpp:337:39:337:44 | AST only |
 | map.cpp:339:7:339:9 | map.cpp:337:49:337:54 | AST only |
-| map.cpp:342:7:342:9 | map.cpp:338:39:338:44 | AST only |
 | map.cpp:342:7:342:9 | map.cpp:338:49:338:54 | AST only |
-| map.cpp:345:7:345:9 | map.cpp:337:39:337:44 | AST only |
 | map.cpp:345:7:345:9 | map.cpp:337:49:337:54 | AST only |
-| map.cpp:346:7:346:9 | map.cpp:337:39:337:44 | AST only |
 | map.cpp:346:7:346:9 | map.cpp:337:49:337:54 | AST only |
-| map.cpp:347:7:347:9 | map.cpp:338:39:338:44 | AST only |
 | map.cpp:347:7:347:9 | map.cpp:338:49:338:54 | AST only |
-| map.cpp:348:7:348:9 | map.cpp:338:39:338:44 | AST only |
 | map.cpp:348:7:348:9 | map.cpp:338:49:338:54 | AST only |
-| map.cpp:356:7:356:9 | map.cpp:352:39:352:44 | AST only |
 | map.cpp:356:7:356:9 | map.cpp:352:49:352:54 | AST only |
-| map.cpp:359:7:359:9 | map.cpp:355:39:355:44 | AST only |
 | map.cpp:359:7:359:9 | map.cpp:355:49:355:54 | AST only |
-| map.cpp:362:7:362:9 | map.cpp:352:39:352:44 | AST only |
 | map.cpp:362:7:362:9 | map.cpp:352:49:352:54 | AST only |
-| map.cpp:365:7:365:9 | map.cpp:355:39:355:44 | AST only |
 | map.cpp:365:7:365:9 | map.cpp:355:49:355:54 | AST only |
-| map.cpp:371:7:371:9 | map.cpp:369:39:369:44 | AST only |
 | map.cpp:371:7:371:9 | map.cpp:369:49:369:54 | AST only |
-| map.cpp:371:7:371:9 | map.cpp:370:39:370:44 | AST only |
 | map.cpp:371:7:371:9 | map.cpp:370:49:370:54 | AST only |
-| map.cpp:373:7:373:9 | map.cpp:369:39:369:44 | AST only |
 | map.cpp:373:7:373:9 | map.cpp:369:49:369:54 | AST only |
-| map.cpp:373:7:373:9 | map.cpp:370:39:370:44 | AST only |
 | map.cpp:373:7:373:9 | map.cpp:370:49:370:54 | AST only |
-| map.cpp:375:7:375:9 | map.cpp:369:39:369:44 | AST only |
 | map.cpp:375:7:375:9 | map.cpp:369:49:369:54 | AST only |
-| map.cpp:375:7:375:9 | map.cpp:370:39:370:44 | AST only |
 | map.cpp:375:7:375:9 | map.cpp:370:49:370:54 | AST only |
 | movableclass.cpp:65:11:65:11 | movableclass.cpp:65:13:65:18 | AST only |
 | movableclass.cpp:65:11:65:21 | movableclass.cpp:65:13:65:18 | IR only |
@@ -208,59 +164,63 @@
 | standalone_iterators.cpp:42:10:42:10 | standalone_iterators.cpp:39:45:39:51 | AST only |
 | standalone_iterators.cpp:47:10:47:10 | standalone_iterators.cpp:45:39:45:45 | AST only |
 | standalone_iterators.cpp:48:10:48:10 | standalone_iterators.cpp:45:39:45:45 | AST only |
-| string.cpp:32:9:32:13 | string.cpp:26:16:26:21 | AST only |
-| string.cpp:38:13:38:17 | string.cpp:14:10:14:15 | AST only |
-| string.cpp:42:13:42:17 | string.cpp:14:10:14:15 | AST only |
-| string.cpp:45:13:45:17 | string.cpp:14:10:14:15 | AST only |
-| string.cpp:69:7:69:8 | string.cpp:61:19:61:24 | AST only |
-| string.cpp:125:8:125:11 | string.cpp:119:16:119:21 | IR only |
-| string.cpp:161:11:161:11 | string.cpp:154:18:154:23 | AST only |
-| string.cpp:165:11:165:11 | string.cpp:165:14:165:19 | AST only |
-| string.cpp:166:11:166:11 | string.cpp:165:14:165:19 | AST only |
-| string.cpp:198:10:198:15 | string.cpp:190:17:190:22 | AST only |
-| string.cpp:201:10:201:15 | string.cpp:191:11:191:25 | AST only |
-| string.cpp:219:10:219:15 | string.cpp:210:17:210:22 | AST only |
-| string.cpp:223:10:223:15 | string.cpp:210:17:210:22 | AST only |
-| string.cpp:227:10:227:15 | string.cpp:211:11:211:25 | AST only |
-| string.cpp:242:10:242:16 | string.cpp:233:17:233:22 | AST only |
-| string.cpp:246:10:246:16 | string.cpp:233:17:233:22 | AST only |
-| string.cpp:250:10:250:16 | string.cpp:234:11:234:25 | AST only |
-| string.cpp:311:9:311:12 | string.cpp:308:16:308:21 | AST only |
-| string.cpp:339:7:339:7 | string.cpp:335:9:335:23 | AST only |
-| string.cpp:340:7:340:7 | string.cpp:336:12:336:26 | AST only |
-| string.cpp:341:7:341:7 | string.cpp:335:9:335:23 | AST only |
-| string.cpp:349:7:349:9 | string.cpp:348:18:348:32 | AST only |
-| string.cpp:350:11:350:14 | string.cpp:348:18:348:32 | AST only |
-| string.cpp:361:11:361:16 | string.cpp:356:18:356:23 | AST only |
-| string.cpp:380:8:380:14 | string.cpp:372:18:372:23 | IR only |
-| string.cpp:381:13:381:15 | string.cpp:372:18:372:23 | IR only |
-| string.cpp:394:8:394:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:395:8:395:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:397:8:397:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:399:8:399:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:402:8:402:11 | string.cpp:387:18:387:23 | IR only |
-| string.cpp:405:8:405:11 | string.cpp:387:18:387:23 | IR only |
-| string.cpp:407:8:407:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:409:8:409:8 | string.cpp:387:18:387:23 | AST only |
-| string.cpp:413:8:413:11 | string.cpp:387:18:387:23 | IR only |
-| string.cpp:427:10:427:15 | string.cpp:422:14:422:19 | AST only |
-| string.cpp:442:10:442:15 | string.cpp:442:32:442:46 | AST only |
-| string.cpp:455:10:455:15 | string.cpp:450:18:450:23 | AST only |
-| string.cpp:458:11:458:16 | string.cpp:450:18:450:23 | AST only |
-| string.cpp:471:10:471:15 | string.cpp:466:18:466:23 | AST only |
-| string.cpp:474:11:474:16 | string.cpp:466:18:466:23 | AST only |
-| string.cpp:487:10:487:15 | string.cpp:482:18:482:23 | AST only |
-| string.cpp:515:9:515:13 | string.cpp:514:14:514:28 | AST only |
-| string.cpp:516:9:516:12 | string.cpp:514:14:514:28 | AST only |
-| string.cpp:529:11:529:11 | string.cpp:529:20:529:25 | AST only |
-| string.cpp:530:21:530:21 | string.cpp:530:24:530:29 | AST only |
-| string.cpp:531:25:531:25 | string.cpp:531:15:531:20 | AST only |
-| string.cpp:534:8:534:8 | string.cpp:529:20:529:25 | AST only |
-| string.cpp:536:8:536:8 | string.cpp:530:24:530:29 | AST only |
-| string.cpp:549:11:549:16 | string.cpp:549:27:549:32 | AST only |
-| string.cpp:550:24:550:29 | string.cpp:550:31:550:36 | AST only |
-| string.cpp:554:8:554:8 | string.cpp:549:27:549:32 | AST only |
-| string.cpp:556:8:556:8 | string.cpp:550:31:550:36 | AST only |
+| string.cpp:33:9:33:13 | string.cpp:27:16:27:21 | AST only |
+| string.cpp:39:13:39:17 | string.cpp:14:10:14:15 | AST only |
+| string.cpp:43:13:43:17 | string.cpp:14:10:14:15 | AST only |
+| string.cpp:46:13:46:17 | string.cpp:14:10:14:15 | AST only |
+| string.cpp:70:7:70:8 | string.cpp:62:19:62:24 | AST only |
+| string.cpp:126:8:126:11 | string.cpp:120:16:120:21 | IR only |
+| string.cpp:162:11:162:11 | string.cpp:155:18:155:23 | AST only |
+| string.cpp:166:11:166:11 | string.cpp:166:14:166:19 | AST only |
+| string.cpp:167:11:167:11 | string.cpp:166:14:166:19 | AST only |
+| string.cpp:199:10:199:15 | string.cpp:191:17:191:22 | AST only |
+| string.cpp:202:10:202:15 | string.cpp:192:11:192:25 | AST only |
+| string.cpp:220:10:220:15 | string.cpp:211:17:211:22 | AST only |
+| string.cpp:224:10:224:15 | string.cpp:211:17:211:22 | AST only |
+| string.cpp:228:10:228:15 | string.cpp:212:11:212:25 | AST only |
+| string.cpp:243:10:243:16 | string.cpp:234:17:234:22 | AST only |
+| string.cpp:247:10:247:16 | string.cpp:234:17:234:22 | AST only |
+| string.cpp:251:10:251:16 | string.cpp:235:11:235:25 | AST only |
+| string.cpp:312:9:312:12 | string.cpp:309:16:309:21 | AST only |
+| string.cpp:340:7:340:7 | string.cpp:336:9:336:23 | AST only |
+| string.cpp:341:7:341:7 | string.cpp:337:12:337:26 | AST only |
+| string.cpp:342:7:342:7 | string.cpp:336:9:336:23 | AST only |
+| string.cpp:350:7:350:9 | string.cpp:349:18:349:32 | AST only |
+| string.cpp:351:11:351:14 | string.cpp:349:18:349:32 | AST only |
+| string.cpp:363:11:363:16 | string.cpp:358:18:358:23 | AST only |
+| string.cpp:382:8:382:14 | string.cpp:374:18:374:23 | IR only |
+| string.cpp:383:13:383:15 | string.cpp:374:18:374:23 | IR only |
+| string.cpp:396:8:396:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:397:8:397:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:399:8:399:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:401:8:401:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:404:8:404:11 | string.cpp:389:18:389:23 | IR only |
+| string.cpp:407:8:407:11 | string.cpp:389:18:389:23 | IR only |
+| string.cpp:409:8:409:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:411:8:411:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:415:8:415:11 | string.cpp:389:18:389:23 | IR only |
+| string.cpp:418:8:418:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:419:8:419:10 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:421:8:421:8 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:422:8:422:10 | string.cpp:389:18:389:23 | AST only |
+| string.cpp:436:10:436:15 | string.cpp:431:14:431:19 | AST only |
+| string.cpp:449:10:449:15 | string.cpp:449:32:449:46 | AST only |
+| string.cpp:462:10:462:15 | string.cpp:457:18:457:23 | AST only |
+| string.cpp:465:11:465:16 | string.cpp:457:18:457:23 | AST only |
+| string.cpp:478:10:478:15 | string.cpp:473:18:473:23 | AST only |
+| string.cpp:481:11:481:16 | string.cpp:473:18:473:23 | AST only |
+| string.cpp:494:10:494:15 | string.cpp:489:18:489:23 | AST only |
+| string.cpp:522:9:522:13 | string.cpp:521:14:521:28 | AST only |
+| string.cpp:523:9:523:12 | string.cpp:521:14:521:28 | AST only |
+| string.cpp:536:11:536:11 | string.cpp:536:20:536:25 | AST only |
+| string.cpp:537:21:537:21 | string.cpp:537:24:537:29 | AST only |
+| string.cpp:538:25:538:25 | string.cpp:538:15:538:20 | AST only |
+| string.cpp:541:8:541:8 | string.cpp:536:20:536:25 | AST only |
+| string.cpp:543:8:543:8 | string.cpp:537:24:537:29 | AST only |
+| string.cpp:556:11:556:16 | string.cpp:556:27:556:32 | AST only |
+| string.cpp:557:24:557:29 | string.cpp:557:31:557:36 | AST only |
+| string.cpp:561:8:561:8 | string.cpp:556:27:556:32 | AST only |
+| string.cpp:563:8:563:8 | string.cpp:557:31:557:36 | AST only |
 | stringstream.cpp:32:11:32:22 | stringstream.cpp:32:14:32:19 | IR only |
 | stringstream.cpp:33:20:33:31 | stringstream.cpp:33:23:33:28 | IR only |
 | stringstream.cpp:34:23:34:31 | stringstream.cpp:34:14:34:19 | IR only |
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_ir.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_ir.expected
@@ -45,8 +45,6 @@
 | map.cpp:26:9:26:13 | first | map.cpp:25:12:25:17 | call to source |
 | map.cpp:32:9:32:14 | second | map.cpp:30:13:30:18 | call to source |
 | map.cpp:41:9:41:13 | first | map.cpp:40:30:40:35 | call to source |
-| map.cpp:42:9:42:14 | second | map.cpp:40:30:40:35 | call to source |
-| map.cpp:43:7:43:7 | e | map.cpp:40:30:40:35 | call to source |
 | map.cpp:46:9:46:13 | first | map.cpp:45:37:45:42 | call to source |
 | map.cpp:47:9:47:14 | second | map.cpp:45:37:45:42 | call to source |
 | map.cpp:48:7:48:7 | f | map.cpp:45:37:45:42 | call to source |
@@ -68,63 +66,44 @@
 | map.cpp:76:9:76:13 | first | map.cpp:63:37:63:42 | call to source |
 | map.cpp:77:9:77:14 | second | map.cpp:63:37:63:42 | call to source |
 | map.cpp:78:7:78:7 | l | map.cpp:63:37:63:42 | call to source |
-| map.cpp:83:7:83:32 | call to pair | map.cpp:83:17:83:22 | call to source |
-| map.cpp:84:34:84:38 | first | map.cpp:84:17:84:22 | call to source |
-| map.cpp:85:34:85:39 | second | map.cpp:85:17:85:22 | call to source |
 | map.cpp:86:7:86:32 | call to pair | map.cpp:86:24:86:29 | call to source |
 | map.cpp:87:34:87:38 | first | map.cpp:87:24:87:29 | call to source |
 | map.cpp:88:34:88:39 | second | map.cpp:88:24:88:29 | call to source |
-| map.cpp:93:9:93:13 | first | map.cpp:91:33:91:38 | call to source |
-| map.cpp:94:15:94:19 | first | map.cpp:91:33:91:38 | call to source |
-| map.cpp:95:15:95:20 | second | map.cpp:91:33:91:38 | call to source |
-| map.cpp:96:9:96:14 | second | map.cpp:91:33:91:38 | call to source |
 | map.cpp:105:7:105:54 | call to iterator | map.cpp:105:39:105:44 | call to source |
-| map.cpp:106:7:106:54 | call to iterator | map.cpp:106:32:106:37 | call to source |
 | map.cpp:107:10:107:15 | call to insert | map.cpp:107:62:107:67 | call to source |
 | map.cpp:108:7:108:48 | call to iterator | map.cpp:108:34:108:39 | call to source |
 | map.cpp:109:10:109:25 | call to insert_or_assign | map.cpp:109:46:109:51 | call to source |
 | map.cpp:117:10:117:13 | call to find | map.cpp:105:39:105:44 | call to source |
-| map.cpp:118:10:118:13 | call to find | map.cpp:106:32:106:37 | call to source |
 | map.cpp:119:10:119:13 | call to find | map.cpp:107:62:107:67 | call to source |
 | map.cpp:123:10:123:13 | call to find | map.cpp:105:39:105:44 | call to source |
-| map.cpp:124:10:124:13 | call to find | map.cpp:106:32:106:37 | call to source |
 | map.cpp:125:10:125:13 | call to find | map.cpp:107:62:107:67 | call to source |
 | map.cpp:139:10:139:13 | call to find | map.cpp:105:39:105:44 | call to source |
 | map.cpp:151:8:151:10 | call to pair | map.cpp:105:39:105:44 | call to source |
 | map.cpp:152:12:152:16 | first | map.cpp:105:39:105:44 | call to source |
 | map.cpp:153:12:153:17 | second | map.cpp:105:39:105:44 | call to source |
-| map.cpp:157:8:157:10 | call to pair | map.cpp:106:32:106:37 | call to source |
 | map.cpp:158:12:158:16 | first | map.cpp:105:39:105:44 | call to source |
 | map.cpp:159:12:159:17 | second | map.cpp:105:39:105:44 | call to source |
 | map.cpp:165:7:165:27 | ... = ... | map.cpp:165:20:165:25 | call to source |
 | map.cpp:167:7:167:30 | ... = ... | map.cpp:167:23:167:28 | call to source |
-| map.cpp:223:11:223:15 | call to erase | map.cpp:220:39:220:44 | call to source |
 | map.cpp:223:11:223:15 | call to erase | map.cpp:220:49:220:54 | call to source |
-| map.cpp:223:11:223:15 | call to erase | map.cpp:221:39:221:44 | call to source |
 | map.cpp:223:11:223:15 | call to erase | map.cpp:221:49:221:54 | call to source |
 | map.cpp:257:7:257:54 | call to iterator | map.cpp:257:39:257:44 | call to source |
-| map.cpp:258:7:258:54 | call to iterator | map.cpp:258:32:258:37 | call to source |
 | map.cpp:259:10:259:15 | call to insert | map.cpp:259:62:259:67 | call to source |
 | map.cpp:260:7:260:48 | call to iterator | map.cpp:260:34:260:39 | call to source |
 | map.cpp:261:10:261:25 | call to insert_or_assign | map.cpp:261:46:261:51 | call to source |
 | map.cpp:269:10:269:13 | call to find | map.cpp:257:39:257:44 | call to source |
-| map.cpp:270:10:270:13 | call to find | map.cpp:258:32:258:37 | call to source |
 | map.cpp:271:10:271:13 | call to find | map.cpp:259:62:259:67 | call to source |
 | map.cpp:275:10:275:13 | call to find | map.cpp:257:39:257:44 | call to source |
-| map.cpp:276:10:276:13 | call to find | map.cpp:258:32:258:37 | call to source |
 | map.cpp:277:10:277:13 | call to find | map.cpp:259:62:259:67 | call to source |
 | map.cpp:291:10:291:13 | call to find | map.cpp:257:39:257:44 | call to source |
 | map.cpp:303:8:303:10 | call to pair | map.cpp:257:39:257:44 | call to source |
 | map.cpp:304:12:304:16 | first | map.cpp:257:39:257:44 | call to source |
 | map.cpp:305:12:305:17 | second | map.cpp:257:39:257:44 | call to source |
-| map.cpp:309:8:309:10 | call to pair | map.cpp:258:32:258:37 | call to source |
 | map.cpp:310:12:310:16 | first | map.cpp:257:39:257:44 | call to source |
 | map.cpp:311:12:311:17 | second | map.cpp:257:39:257:44 | call to source |
 | map.cpp:317:7:317:27 | ... = ... | map.cpp:317:20:317:25 | call to source |
 | map.cpp:319:7:319:30 | ... = ... | map.cpp:319:23:319:28 | call to source |
-| map.cpp:372:11:372:15 | call to erase | map.cpp:369:39:369:44 | call to source |
 | map.cpp:372:11:372:15 | call to erase | map.cpp:369:49:369:54 | call to source |
-| map.cpp:372:11:372:15 | call to erase | map.cpp:370:39:370:44 | call to source |
 | map.cpp:372:11:372:15 | call to erase | map.cpp:370:49:370:54 | call to source |
 | movableclass.cpp:44:8:44:9 | s1 | movableclass.cpp:39:21:39:26 | call to source |
 | movableclass.cpp:45:8:45:9 | s2 | movableclass.cpp:40:23:40:28 | call to source |
@@ -161,80 +140,80 @@
 | smart_pointer.cpp:57:12:57:14 | call to get | smart_pointer.cpp:56:52:56:57 | call to source |
 | standalone_iterators.cpp:40:10:40:10 | call to operator* | standalone_iterators.cpp:39:45:39:51 | source1 |
 | standalone_iterators.cpp:46:10:46:10 | call to operator* | standalone_iterators.cpp:45:39:45:45 | source1 |
-| string.cpp:28:7:28:7 | a | string.cpp:24:12:24:17 | call to source |
-| string.cpp:30:7:30:7 | Argument 0 indirection | string.cpp:26:16:26:21 | call to source |
-| string.cpp:55:7:55:8 | cs | string.cpp:50:19:50:24 | call to source |
-| string.cpp:56:7:56:8 | Argument 0 indirection | string.cpp:50:19:50:24 | call to source |
-| string.cpp:70:7:70:8 | Argument 0 indirection | string.cpp:61:19:61:24 | call to source |
-| string.cpp:92:8:92:9 | Argument 0 indirection | string.cpp:87:18:87:23 | call to source |
-| string.cpp:93:8:93:9 | Argument 0 indirection | string.cpp:88:20:88:25 | call to source |
-| string.cpp:94:8:94:9 | Argument 0 indirection | string.cpp:90:8:90:13 | call to source |
-| string.cpp:113:8:113:9 | Argument 0 indirection | string.cpp:109:32:109:37 | call to source |
-| string.cpp:114:8:114:9 | Argument 0 indirection | string.cpp:111:20:111:25 | call to source |
-| string.cpp:121:8:121:8 | c | string.cpp:119:16:119:21 | call to source |
-| string.cpp:125:8:125:8 | call to operator* | string.cpp:119:16:119:21 | call to source |
-| string.cpp:125:8:125:11 | (reference dereference) | string.cpp:119:16:119:21 | call to source |
-| string.cpp:129:8:129:8 | (reference dereference) | string.cpp:119:16:119:21 | call to source |
-| string.cpp:129:8:129:8 | c | string.cpp:119:16:119:21 | call to source |
-| string.cpp:134:8:134:8 | (reference dereference) | string.cpp:132:28:132:33 | call to source |
-| string.cpp:134:8:134:8 | c | string.cpp:132:28:132:33 | call to source |
-| string.cpp:144:11:144:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:145:11:145:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:146:11:146:11 | call to operator+ | string.cpp:141:18:141:23 | call to source |
-| string.cpp:149:11:149:11 | call to operator+ | string.cpp:149:13:149:18 | call to source |
-| string.cpp:158:8:158:9 | Argument 0 indirection | string.cpp:154:18:154:23 | call to source |
-| string.cpp:162:8:162:9 | Argument 0 indirection | string.cpp:154:18:154:23 | call to source |
-| string.cpp:167:8:167:9 | Argument 0 indirection | string.cpp:165:14:165:19 | call to source |
-| string.cpp:171:8:171:9 | Argument 0 indirection | string.cpp:154:18:154:23 | call to source |
-| string.cpp:176:8:176:9 | Argument 0 indirection | string.cpp:174:13:174:18 | call to source |
-| string.cpp:184:8:184:10 | Argument 0 indirection | string.cpp:181:12:181:26 | call to source |
-| string.cpp:199:7:199:8 | Argument 0 indirection | string.cpp:190:17:190:22 | call to source |
-| string.cpp:202:7:202:8 | Argument 0 indirection | string.cpp:191:11:191:25 | call to source |
-| string.cpp:205:7:205:8 | Argument 0 indirection | string.cpp:193:17:193:22 | call to source |
-| string.cpp:220:7:220:8 | Argument 0 indirection | string.cpp:210:17:210:22 | call to source |
-| string.cpp:224:7:224:8 | Argument 0 indirection | string.cpp:210:17:210:22 | call to source |
-| string.cpp:228:7:228:8 | Argument 0 indirection | string.cpp:211:11:211:25 | call to source |
-| string.cpp:243:7:243:8 | Argument 0 indirection | string.cpp:233:17:233:22 | call to source |
-| string.cpp:247:7:247:8 | Argument 0 indirection | string.cpp:233:17:233:22 | call to source |
-| string.cpp:251:7:251:8 | Argument 0 indirection | string.cpp:234:11:234:25 | call to source |
-| string.cpp:264:7:264:8 | Argument 0 indirection | string.cpp:258:17:258:22 | call to source |
-| string.cpp:274:7:274:8 | Argument 0 indirection | string.cpp:269:17:269:22 | call to source |
-| string.cpp:276:7:276:8 | Argument 0 indirection | string.cpp:271:17:271:22 | call to source |
-| string.cpp:281:7:281:8 | Argument 0 indirection | string.cpp:269:17:269:22 | call to source |
-| string.cpp:282:7:282:8 | Argument 0 indirection | string.cpp:269:17:269:22 | call to source |
-| string.cpp:283:7:283:8 | Argument 0 indirection | string.cpp:271:17:271:22 | call to source |
-| string.cpp:284:7:284:8 | Argument 0 indirection | string.cpp:271:17:271:22 | call to source |
-| string.cpp:292:7:292:8 | Argument 0 indirection | string.cpp:288:17:288:22 | call to source |
+| string.cpp:29:7:29:7 | a | string.cpp:25:12:25:17 | call to source |
+| string.cpp:31:7:31:7 | Argument 0 indirection | string.cpp:27:16:27:21 | call to source |
+| string.cpp:56:7:56:8 | cs | string.cpp:51:19:51:24 | call to source |
+| string.cpp:57:7:57:8 | Argument 0 indirection | string.cpp:51:19:51:24 | call to source |
+| string.cpp:71:7:71:8 | Argument 0 indirection | string.cpp:62:19:62:24 | call to source |
+| string.cpp:93:8:93:9 | Argument 0 indirection | string.cpp:88:18:88:23 | call to source |
+| string.cpp:94:8:94:9 | Argument 0 indirection | string.cpp:89:20:89:25 | call to source |
+| string.cpp:95:8:95:9 | Argument 0 indirection | string.cpp:91:8:91:13 | call to source |
+| string.cpp:114:8:114:9 | Argument 0 indirection | string.cpp:110:32:110:37 | call to source |
+| string.cpp:115:8:115:9 | Argument 0 indirection | string.cpp:112:20:112:25 | call to source |
+| string.cpp:122:8:122:8 | c | string.cpp:120:16:120:21 | call to source |
+| string.cpp:126:8:126:8 | call to operator* | string.cpp:120:16:120:21 | call to source |
+| string.cpp:126:8:126:11 | (reference dereference) | string.cpp:120:16:120:21 | call to source |
+| string.cpp:130:8:130:8 | (reference dereference) | string.cpp:120:16:120:21 | call to source |
+| string.cpp:130:8:130:8 | c | string.cpp:120:16:120:21 | call to source |
+| string.cpp:135:8:135:8 | (reference dereference) | string.cpp:133:28:133:33 | call to source |
+| string.cpp:135:8:135:8 | c | string.cpp:133:28:133:33 | call to source |
+| string.cpp:145:11:145:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:146:11:146:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:147:11:147:11 | call to operator+ | string.cpp:142:18:142:23 | call to source |
+| string.cpp:150:11:150:11 | call to operator+ | string.cpp:150:13:150:18 | call to source |
+| string.cpp:159:8:159:9 | Argument 0 indirection | string.cpp:155:18:155:23 | call to source |
+| string.cpp:163:8:163:9 | Argument 0 indirection | string.cpp:155:18:155:23 | call to source |
+| string.cpp:168:8:168:9 | Argument 0 indirection | string.cpp:166:14:166:19 | call to source |
+| string.cpp:172:8:172:9 | Argument 0 indirection | string.cpp:155:18:155:23 | call to source |
+| string.cpp:177:8:177:9 | Argument 0 indirection | string.cpp:175:13:175:18 | call to source |
+| string.cpp:185:8:185:10 | Argument 0 indirection | string.cpp:182:12:182:26 | call to source |
+| string.cpp:200:7:200:8 | Argument 0 indirection | string.cpp:191:17:191:22 | call to source |
+| string.cpp:203:7:203:8 | Argument 0 indirection | string.cpp:192:11:192:25 | call to source |
+| string.cpp:206:7:206:8 | Argument 0 indirection | string.cpp:194:17:194:22 | call to source |
+| string.cpp:221:7:221:8 | Argument 0 indirection | string.cpp:211:17:211:22 | call to source |
+| string.cpp:225:7:225:8 | Argument 0 indirection | string.cpp:211:17:211:22 | call to source |
+| string.cpp:229:7:229:8 | Argument 0 indirection | string.cpp:212:11:212:25 | call to source |
+| string.cpp:244:7:244:8 | Argument 0 indirection | string.cpp:234:17:234:22 | call to source |
+| string.cpp:248:7:248:8 | Argument 0 indirection | string.cpp:234:17:234:22 | call to source |
+| string.cpp:252:7:252:8 | Argument 0 indirection | string.cpp:235:11:235:25 | call to source |
+| string.cpp:265:7:265:8 | Argument 0 indirection | string.cpp:259:17:259:22 | call to source |
+| string.cpp:275:7:275:8 | Argument 0 indirection | string.cpp:270:17:270:22 | call to source |
+| string.cpp:277:7:277:8 | Argument 0 indirection | string.cpp:272:17:272:22 | call to source |
+| string.cpp:282:7:282:8 | Argument 0 indirection | string.cpp:270:17:270:22 | call to source |
+| string.cpp:283:7:283:8 | Argument 0 indirection | string.cpp:270:17:270:22 | call to source |
+| string.cpp:284:7:284:8 | Argument 0 indirection | string.cpp:272:17:272:22 | call to source |
+| string.cpp:285:7:285:8 | Argument 0 indirection | string.cpp:272:17:272:22 | call to source |
 | string.cpp:293:7:293:8 | Argument 0 indirection | string.cpp:289:17:289:22 | call to source |
 | string.cpp:294:7:294:8 | Argument 0 indirection | string.cpp:290:17:290:22 | call to source |
-| string.cpp:300:7:300:8 | Argument 0 indirection | string.cpp:288:17:288:22 | call to source |
-| string.cpp:302:7:302:8 | Argument 0 indirection | string.cpp:290:17:290:22 | call to source |
-| string.cpp:322:9:322:14 | call to substr | string.cpp:319:16:319:21 | call to source |
-| string.cpp:362:8:362:9 | Argument 0 indirection | string.cpp:356:18:356:23 | call to source |
-| string.cpp:380:8:380:8 | call to operator* | string.cpp:372:18:372:23 | call to source |
-| string.cpp:380:8:380:14 | (reference dereference) | string.cpp:372:18:372:23 | call to source |
-| string.cpp:381:13:381:13 | call to operator[] | string.cpp:372:18:372:23 | call to source |
-| string.cpp:381:13:381:15 | (reference dereference) | string.cpp:372:18:372:23 | call to source |
-| string.cpp:402:8:402:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:402:8:402:11 | (reference dereference) | string.cpp:387:18:387:23 | call to source |
-| string.cpp:405:8:405:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:405:8:405:11 | (reference dereference) | string.cpp:387:18:387:23 | call to source |
-| string.cpp:413:8:413:8 | call to operator* | string.cpp:387:18:387:23 | call to source |
-| string.cpp:413:8:413:11 | (reference dereference) | string.cpp:387:18:387:23 | call to source |
-| string.cpp:428:7:428:8 | Argument 0 indirection | string.cpp:422:14:422:19 | call to source |
-| string.cpp:443:8:443:8 | Argument 0 indirection | string.cpp:442:32:442:46 | call to source |
-| string.cpp:456:8:456:8 | Argument 0 indirection | string.cpp:450:18:450:23 | call to source |
-| string.cpp:459:8:459:9 | Argument 0 indirection | string.cpp:450:18:450:23 | call to source |
-| string.cpp:472:8:472:8 | Argument 0 indirection | string.cpp:466:18:466:23 | call to source |
-| string.cpp:475:8:475:9 | Argument 0 indirection | string.cpp:466:18:466:23 | call to source |
-| string.cpp:488:8:488:8 | Argument 0 indirection | string.cpp:482:18:482:23 | call to source |
-| string.cpp:491:8:491:9 | Argument 0 indirection | string.cpp:482:18:482:23 | call to source |
-| string.cpp:504:7:504:8 | Argument 0 indirection | string.cpp:497:14:497:19 | call to source |
-| string.cpp:506:7:506:8 | Argument 0 indirection | string.cpp:497:14:497:19 | call to source |
-| string.cpp:535:8:535:8 | Argument 0 indirection | string.cpp:529:20:529:25 | call to source |
-| string.cpp:537:8:537:8 | Argument 0 indirection | string.cpp:531:15:531:20 | call to source |
-| string.cpp:555:8:555:8 | Argument 0 indirection | string.cpp:549:27:549:32 | call to source |
-| string.cpp:557:8:557:8 | Argument 0 indirection | string.cpp:551:18:551:23 | call to source |
+| string.cpp:295:7:295:8 | Argument 0 indirection | string.cpp:291:17:291:22 | call to source |
+| string.cpp:301:7:301:8 | Argument 0 indirection | string.cpp:289:17:289:22 | call to source |
+| string.cpp:303:7:303:8 | Argument 0 indirection | string.cpp:291:17:291:22 | call to source |
+| string.cpp:323:9:323:14 | call to substr | string.cpp:320:16:320:21 | call to source |
+| string.cpp:364:8:364:9 | Argument 0 indirection | string.cpp:358:18:358:23 | call to source |
+| string.cpp:382:8:382:8 | call to operator* | string.cpp:374:18:374:23 | call to source |
+| string.cpp:382:8:382:14 | (reference dereference) | string.cpp:374:18:374:23 | call to source |
+| string.cpp:383:13:383:13 | call to operator[] | string.cpp:374:18:374:23 | call to source |
+| string.cpp:383:13:383:15 | (reference dereference) | string.cpp:374:18:374:23 | call to source |
+| string.cpp:404:8:404:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:404:8:404:11 | (reference dereference) | string.cpp:389:18:389:23 | call to source |
+| string.cpp:407:8:407:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:407:8:407:11 | (reference dereference) | string.cpp:389:18:389:23 | call to source |
+| string.cpp:415:8:415:8 | call to operator* | string.cpp:389:18:389:23 | call to source |
+| string.cpp:415:8:415:11 | (reference dereference) | string.cpp:389:18:389:23 | call to source |
+| string.cpp:437:7:437:8 | Argument 0 indirection | string.cpp:431:14:431:19 | call to source |
+| string.cpp:450:8:450:8 | Argument 0 indirection | string.cpp:449:32:449:46 | call to source |
+| string.cpp:463:8:463:8 | Argument 0 indirection | string.cpp:457:18:457:23 | call to source |
+| string.cpp:466:8:466:9 | Argument 0 indirection | string.cpp:457:18:457:23 | call to source |
+| string.cpp:479:8:479:8 | Argument 0 indirection | string.cpp:473:18:473:23 | call to source |
+| string.cpp:482:8:482:9 | Argument 0 indirection | string.cpp:473:18:473:23 | call to source |
+| string.cpp:495:8:495:8 | Argument 0 indirection | string.cpp:489:18:489:23 | call to source |
+| string.cpp:498:8:498:9 | Argument 0 indirection | string.cpp:489:18:489:23 | call to source |
+| string.cpp:511:7:511:8 | Argument 0 indirection | string.cpp:504:14:504:19 | call to source |
+| string.cpp:513:7:513:8 | Argument 0 indirection | string.cpp:504:14:504:19 | call to source |
+| string.cpp:542:8:542:8 | Argument 0 indirection | string.cpp:536:20:536:25 | call to source |
+| string.cpp:544:8:544:8 | Argument 0 indirection | string.cpp:538:15:538:20 | call to source |
+| string.cpp:562:8:562:8 | Argument 0 indirection | string.cpp:556:27:556:32 | call to source |
+| string.cpp:564:8:564:8 | Argument 0 indirection | string.cpp:558:18:558:23 | call to source |
 | stringstream.cpp:32:11:32:11 | call to operator<< | stringstream.cpp:32:14:32:19 | call to source |
 | stringstream.cpp:32:11:32:22 | (reference dereference) | stringstream.cpp:32:14:32:19 | call to source |
 | stringstream.cpp:33:20:33:20 | call to operator<< | stringstream.cpp:33:23:33:28 | call to source |