mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-07 14:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19152 from antlilja/llvm-broken-debug

Browse Source 
LLVM: Fail to emit if LLVM encounters broken debug info
This commit is contained in:
Andrew Kelley 2024-03-02 21:43:39 -08:00 committed by GitHub
commit 90c1a2c41a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen/llvm.zig
View File

@ -1245,9 +1245,11 @@ pub const Object = struct {
);
defer bitcode_memory_buffer.dispose();
context.enableBrokenDebugInfoCheck();
var module: *llvm.Module = undefined;
if (context.parseBitcodeInContext2(bitcode_memory_buffer, &module).toBool()) {
std.debug.print("Failed to parse bitcode\n", .{});
if (context.parseBitcodeInContext2(bitcode_memory_buffer, &module).toBool() or context.getBrokenDebugInfo()) {
log.err("Failed to parse bitcode", .{});
return error.FailedToEmit;
}
break :emit .{ context, module };

6
src/codegen/llvm/bindings.zig
View File

@ -37,6 +37,12 @@ pub const Context = opaque {
pub const setOptBisectLimit = ZigLLVMSetOptBisectLimit;
extern fn ZigLLVMSetOptBisectLimit(C: *Context, limit: c_int) void;
pub const enableBrokenDebugInfoCheck = ZigLLVMEnableBrokenDebugInfoCheck;
extern fn ZigLLVMEnableBrokenDebugInfoCheck(C: *Context) void;
pub const getBrokenDebugInfo = ZigLLVMGetBrokenDebugInfo;
extern fn ZigLLVMGetBrokenDebugInfo(C: *Context) bool;
};
pub const Module = opaque {

25
src/zig_llvm.cpp
View File

@ -380,6 +380,31 @@ void ZigLLVMSetOptBisectLimit(LLVMContextRef context_ref, int limit) {
unwrap(context_ref)->setOptPassGate(opt_bisect);
}
struct ZigDiagnosticHandler : public DiagnosticHandler {
bool BrokenDebugInfo;
ZigDiagnosticHandler() : BrokenDebugInfo(false) {}
bool handleDiagnostics(const DiagnosticInfo &DI) override {
// This dyn_cast should be casting to DiagnosticInfoIgnoringInvalidDebugMetadata
// but DiagnosticInfoIgnoringInvalidDebugMetadata is treated as DiagnosticInfoDebugMetadataVersion
// because of a bug in LLVM (see https://github.com/ziglang/zig/issues/19161).
// After this is fixed add an additional check for DiagnosticInfoIgnoringInvalidDebugMetadata
// but don't remove the current one as both indicate that debug info is broken.
if (auto *Remark = dyn_cast<DiagnosticInfoDebugMetadataVersion>(&DI)) {
BrokenDebugInfo = true;
}
return false;
}
};
void ZigLLVMEnableBrokenDebugInfoCheck(LLVMContextRef context_ref) {
unwrap(context_ref)->setDiagnosticHandler(std::make_unique<ZigDiagnosticHandler>());
}
bool ZigLLVMGetBrokenDebugInfo(LLVMContextRef context_ref) {
return ((const ZigDiagnosticHandler*)
unwrap(context_ref)->getDiagHandlerPtr())->BrokenDebugInfo;
}
void ZigLLVMParseCommandLineOptions(size_t argc, const char *const *argv) {
cl::ParseCommandLineOptions(argc, argv);
}

3
src/zig_llvm.h
View File

@ -44,6 +44,9 @@ ZIG_EXTERN_C LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, co
ZIG_EXTERN_C void ZigLLVMSetOptBisectLimit(LLVMContextRef context_ref, int limit);
ZIG_EXTERN_C void ZigLLVMEnableBrokenDebugInfoCheck(LLVMContextRef context_ref);
ZIG_EXTERN_C bool ZigLLVMGetBrokenDebugInfo(LLVMContextRef context_ref);
enum ZigLLVMTailCallKind {
ZigLLVMTailCallKindNone,
ZigLLVMTailCallKindTail,