Fix more tests

Author: fangyi-zhou

clang/include/clang/StaticAnalyzer/Checkers/SValExplainer.h

@@ -118,6 +118,11 @@ class SValExplainer : public FullSValVisitor<SValExplainer, std::string> {
     OS << "symbol of type '" + S->getType().getAsString() +
               "' conjured at statement '";
     S->getCFGElementRef()->dumpToStream(OS);
+    // HACK: dumpToStream will output a new line in the end, this is
+    // undesireable, thus we remove it.
+    if (Str.back() == '\n') {
+      Str.pop_back();
+    }
     OS << "'";
     return Str;
   }

clang/test/Analysis/ctor-trivial-copy.cpp

@@ -21,11 +21,11 @@ struct empty {
 void test_copy_return() {
   aggr s1 = {1, 2};
   aggr const& cr1 = aggr(s1);
-  clang_analyzer_dump_lref(cr1); // expected-warning-re {{&lifetime_extended_object{aggr, cr1, CFGElemRef{{[0-9]+}}} }}
+  clang_analyzer_dump_lref(cr1); // expected-warning-re {{&lifetime_extended_object{aggr, cr1, S{{[0-9]+}}} }}
 
   empty s2;
   empty const& cr2 = empty{s2};
-  clang_analyzer_dump_lref(cr2); // expected-warning-re {{&lifetime_extended_object{empty, cr2, CFGElemRef{{[0-9]+}}} }}
+  clang_analyzer_dump_lref(cr2); // expected-warning-re {{&lifetime_extended_object{empty, cr2, S{{[0-9]+}}} }}
 }
 
 void test_assign_return() {

clang/test/Analysis/dump_egraph.cpp

@@ -21,6 +21,6 @@ void foo() {
 
 // CHECK: \"location_context\": \"#0 Call\", \"calling\": \"T::T\", \"location\": \{ \"line\": 15, \"column\": 5, \"file\": \"{{.*}}dump_egraph.cpp\" \}, \"items\": [\l        \{ \"init_id\": {{[0-9]+}}, \"kind\": \"construct into member variable\", \"argument_index\": null, \"pretty\": \"s\", \"value\": \"&t.s\"
 
-// CHECK: \"cluster\": \"t\", \"pointer\": \"{{0x[0-9a-f]+}}\", \"items\": [\l        \{ \"kind\": \"Default\", \"offset\": 0, \"value\": \"conj_$3\{int, LC5, CFGElemRef{{[0-9=+]}}, #1\}\"
+// CHECK: \"cluster\": \"t\", \"pointer\": \"{{0x[0-9a-f]+}}\", \"items\": [\l        \{ \"kind\": \"Default\", \"offset\": 0, \"value\": \"conj_$3\{int, LC5, CFGElemRef{{[0-9]+}}, #1\}\"
 
 // CHECK: \"dynamic_types\": [\l      \{ \"region\": \"HeapSymRegion\{conj_$1\{S *, LC1, CFGElemRef{{[0-9]+}}, #1\}\}\", \"dyn_type\": \"S\", \"sub_classable\": false \}\l

clang/test/Analysis/exploded-graph-rewriter/dynamic_types.cpp

@@ -10,7 +10,7 @@ void test() {
   // CHECK: Dynamic Types:
   // CHECK-SAME: <tr><td align="left"><table border="0"><tr>
   // CHECK-SAME:   <td align="left">HeapSymRegion\{conj_$1\{S *, LC1,
-  // CHECK-SAME:       S{{[0-9]*}}, #1\}\}</td>
+  // CHECK-SAME:       CFGElemRef{{[0-9]*}}, #1\}\}</td>
   // CHECK-SAME:   <td align="left">S</td>
   // CHECK-SAME: </tr></table></td></tr>
   new S;