authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-01-16 12:52:04+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-16 12:16:30-05:00
log0267afa9c0aac51089150a9d2f6b2e53e9d2dbff
tree56c0f3ad21647c50f77d51dcdb4fc9c8a45eb406
parent8a792db2d8b0ea775cb255c31c207c513a45ff01

Fix garbled error messages from clang

1 files changed, 3 insertions(+), 1 deletions(-)

src/zig_clang.cpp+3-1
...@@ -2096,7 +2096,9 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char...@@ -2096,7 +2096,9 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
2096 }2096 }
20972097
2098 if (diags->hasErrorOccurred()) {2098 if (diags->hasErrorOccurred()) {
2099 clang::ASTUnit *unit = ast_unit ? ast_unit : err_unit.get();2099 // Take ownership of the err_unit ASTUnit object so that it won't be
2100 // free'd when we return, invalidating the error message pointers
2101 clang::ASTUnit *unit = ast_unit ? ast_unit : err_unit.release();
2100 ZigList<Stage2ErrorMsg> errors = {};2102 ZigList<Stage2ErrorMsg> errors = {};
21012103
2102 for (clang::ASTUnit::stored_diag_iterator it = unit->stored_diag_begin(),2104 for (clang::ASTUnit::stored_diag_iterator it = unit->stored_diag_begin(),