motiejus/zig
1
Fork 0
Code Releases Activity

eliminate dependency of libzigcpp.a on libzigstage1.a

Browse Source 
This allows us to create a build of self-hosted with LLVM extensions
enabled but without the stage1 backend.
This commit is contained in:
Andrew Kelley
2020-09-23 00:00:24 -07:00
parent fc88d36dae
commit 800a4a6ceb
5 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zig_clang.cpp
View File

@@ -13,7 +13,6 @@
* 3. Prevent C++ from infecting the rest of the project.
*/
#include "zig_clang.h"
#include "list.hpp"
#if __GNUC__ >= 8
#pragma GCC diagnostic push
@@ -2186,7 +2185,7 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
// Take ownership of the err_unit ASTUnit object so that it won't be
// free'd when we return, invalidating the error message pointers
clang::ASTUnit *unit = ast_unit ? ast_unit : err_unit.release();
ZigList<Stage2ErrorMsg> errors = {};
Stage2ErrorMsg *errors = nullptr;
for (clang::ASTUnit::stored_diag_iterator it = unit->stored_diag_begin(),
it_end = unit->stored_diag_end(); it != it_end; ++it)
@@ -2204,7 +2203,10 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
llvm::StringRef msg_str_ref = it->getMessage();
Stage2ErrorMsg *msg = errors.add_one();
*errors_len += 1;
errors = reinterpret_cast<Stage2ErrorMsg*>(realloc(errors, sizeof(Stage2ErrorMsg) * *errors_len));
if (errors == nullptr) abort();
Stage2ErrorMsg *msg = &errors[*errors_len - 1];
memset(msg, 0, sizeof(*msg));
msg->msg_ptr = (const char *)msg_str_ref.bytes_begin();
@@ -2242,8 +2244,7 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
}
}
*errors_ptr = errors.items;
*errors_len = errors.length;
*errors_ptr = errors;
return nullptr;
}