Author: dergachev Date: Wed Jun 19 16:33:45 2019 New Revision: 363894 URL: http://llvm.org/viewvc/llvm-project?rev=363894&view=rev Log: [analyzer] Fix JSON dumps for dynamic type information.
They're now valid JSON. Differential Revision: https://reviews.llvm.org/D62716 Modified: cfe/trunk/lib/StaticAnalyzer/Core/DynamicTypeMap.cpp cfe/trunk/test/Analysis/dump_egraph.cpp Modified: cfe/trunk/lib/StaticAnalyzer/Core/DynamicTypeMap.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/DynamicTypeMap.cpp?rev=363894&r1=363893&r2=363894&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/DynamicTypeMap.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/DynamicTypeMap.cpp Wed Jun 19 16:33:45 2019 @@ -72,12 +72,12 @@ void printDynamicTypeInfoJson(raw_ostrea Out << "{ \"region\": \"" << MR << "\", \"dyn_type\": "; if (DTI.isValid()) { Out << '\"' << DTI.getType()->getPointeeType().getAsString() - << "\" \"sub_classable\": " + << "\", \"sub_classable\": " << (DTI.canBeASubClass() ? "true" : "false"); } else { Out << "null"; // Invalid type info } - Out << "\" }"; + Out << "}"; if (std::next(I) != DTM.end()) Out << ','; Modified: cfe/trunk/test/Analysis/dump_egraph.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/dump_egraph.cpp?rev=363894&r1=363893&r2=363894&view=diff ============================================================================== --- cfe/trunk/test/Analysis/dump_egraph.cpp (original) +++ cfe/trunk/test/Analysis/dump_egraph.cpp Wed Jun 19 16:33:45 2019 @@ -14,11 +14,14 @@ struct T { void foo() { // Test that dumping symbols conjured on null statements doesn't crash. T t; + + new S; } // CHECK: \"location_context\": \"#0 Call\", \"calling\": \"foo\", \"call_line\": null, \"items\": [\l \{ \"lctx_id\": 1, \"stmt_id\": {{[0-9]+}}, \"kind\": \"construct into local variable\", \"argument_index\": null, \"pretty\": \"T t;\", \"value\": \"&t\" // CHECK: \"location_context\": \"#0 Call\", \"calling\": \"T::T\", \"call_line\": \"16\", \"items\": [\l \{ \"lctx_id\": 2, \"init_id\": {{[0-9]+}}, \"kind\": \"construct into member variable\", \"argument_index\": null, \"pretty\": \"s\", \"value\": \"&t-\>s\" -// CHECK: \"cluster\": \"t\", \"items\": [\l \{ \"kind\": \"Default\", \"offset\": 0, \"value\": \"conj_$3\{int, LC3, no stmt, #1\}\" +// CHECK: \"cluster\": \"t\", \"items\": [\l \{ \"kind\": \"Default\", \"offset\": 0, \"value\": \"conj_$2\{int, LC5, no stmt, #1\}\" +// CHECK: \"dynamic_types\": [\l\{ \"region\": \"HeapSymRegion\{conj_$1\{struct S *, LC1, S{{[0-9]+}}, #1\}\}\", \"dyn_type\": \"struct S\", \"sub_classable\": false\}\l _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits