This is an archive of the discontinued LLVM Phabricator instance.

Differential D129113

Fix test: LLVMGetBitcodeModule takes ownership of memory buffer
ClosedPublic

Authored by nhaehnle on Jul 5 2022, 2:13 AM.

Details

Reviewers
efriedma
lattner
deadalnix
nikic
Commits
rG5a731d733c56: Fix test: LLVMGetBitcodeModule takes ownership of memory buffer
Summary

Clarify this behavior in the C interface header file and fix a related
bug in a test.

Diff Detail

Event Timeline

nhaehnle created this revision.Jul 5 2022, 2:13 AM
Herald added a reviewer: deadalnix. · View Herald TranscriptJul 5 2022, 2:13 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: yaxunl. · View Herald Transcript
nhaehnle requested review of this revision.Jul 5 2022, 2:13 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 5 2022, 2:13 AM
nhaehnle added a child revision: D129114: llvm-c: Add LLVMDeleteInstruction to fix a test issue.Jul 5 2022, 2:25 AM
foad added a subscriber: foad.Jul 5 2022, 2:40 AM
foad added inline comments.
llvm/include/llvm-c/BitReader.h
65

Spurious *

Harbormaster completed remote builds in B173642: Diff 442212.Jul 5 2022, 3:33 AM
nhaehnle marked an inline comment as done.Jul 5 2022, 11:07 AM
nhaehnle added inline comments.
llvm/include/llvm-c/BitReader.h
65

Thanks, fixing it.

nhaehnle updated this revision to Diff 442359.Jul 5 2022, 11:07 AM
nhaehnle marked an inline comment as done.

Address review comment

Harbormaster completed remote builds in B173744: Diff 442359.Jul 5 2022, 12:22 PM
nikic accepted this revision.Jul 8 2022, 1:02 AM
nikic added a subscriber: nikic.

LGTM. Weird API.

This revision is now accepted and ready to land.Jul 8 2022, 1:02 AM
This revision was landed with ongoing or failed builds.Jul 8 2022, 11:07 AM
Closed by commit rG5a731d733c56: Fix test: LLVMGetBitcodeModule takes ownership of memory buffer (authored by nhaehnle). · Explain Why
This revision was automatically updated to reflect the committed changes.
nhaehnle added a commit: rG5a731d733c56: Fix test: LLVMGetBitcodeModule takes ownership of memory buffer.

Revision Contents

PathSize
llvm/
include/
llvm-c/
9 lines
tools/
llvm-c-test/
9 lines

Diff 443294

llvm/include/llvm-c/BitReader.h

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines
/** Reads a module from the specified path, returning via the OutMP parameter /** Reads a module from the specified path, returning via the OutMP parameter
a module provider which performs lazy deserialization. Returns 0 on success. a module provider which performs lazy deserialization. Returns 0 on success.
Optionally returns a human-readable error message via OutMessage. Optionally returns a human-readable error message via OutMessage.
This is deprecated. Use LLVMGetBitcodeModuleInContext2. */ This is deprecated. Use LLVMGetBitcodeModuleInContext2. */
LLVMBool LLVMGetBitcodeModuleInContext(LLVMContextRef ContextRef, LLVMBool LLVMGetBitcodeModuleInContext(LLVMContextRef ContextRef,
LLVMMemoryBufferRef MemBuf, LLVMMemoryBufferRef MemBuf,
LLVMModuleRef *OutM, char **OutMessage); LLVMModuleRef *OutM, char **OutMessage);
/** Reads a module from the specified path, returning via the OutMP parameter a /** Reads a module from the given memory buffer, returning via the OutMP
* module provider which performs lazy deserialization. Returns 0 on success. */ * parameter a module provider which performs lazy deserialization.
foadUnsubmitted
Done
ReplyInline Actions

Spurious *

foad: Spurious ` * `
nhaehnleAuthorUnsubmitted
Done
ReplyInline Actions

Thanks, fixing it.

nhaehnle: Thanks, fixing it.
*
* Returns 0 on success.
*
* Takes ownership of \p MemBuf if (and only if) the module was read
* successfully. */
LLVMBool LLVMGetBitcodeModuleInContext2(LLVMContextRef ContextRef, LLVMBool LLVMGetBitcodeModuleInContext2(LLVMContextRef ContextRef,
LLVMMemoryBufferRef MemBuf, LLVMMemoryBufferRef MemBuf,
LLVMModuleRef *OutM); LLVMModuleRef *OutM);
/* This is deprecated. Use LLVMGetBitcodeModule2. */ /* This is deprecated. Use LLVMGetBitcodeModule2. */
LLVMBool LLVMGetBitcodeModule(LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutM, LLVMBool LLVMGetBitcodeModule(LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutM,
char **OutMessage); char **OutMessage);
Show All 9 Lines

llvm/tools/llvm-c-test/diagnostic.c

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines if (LLVMCreateMemoryBufferWithSTDIN(&MB, &msg)) {
fprintf(stderr, "Error reading file: %s\n", msg); fprintf(stderr, "Error reading file: %s\n", msg);
LLVMDisposeMessage(msg); LLVMDisposeMessage(msg);
return 1; return 1;
} }
LLVMModuleRef M; LLVMModuleRef M;
int Ret = LLVMGetBitcodeModule2(MB, &M); int Ret = LLVMGetBitcodeModule2(MB, &M);
if (Ret) { if (Ret)
// We do not return if the bitcode was invalid, as we want to test whether
// the diagnostic handler was executed.
fprintf(stderr, "Error parsing bitcode: %s\n", msg);
}
LLVMDisposeMemoryBuffer(MB); LLVMDisposeMemoryBuffer(MB);
if (handlerCalled) { if (handlerCalled) {
fprintf(stderr, "Diagnostic handler was called while loading module\n"); fprintf(stderr, "Diagnostic handler was called while loading module\n");
} else { } else {
fprintf(stderr, "Diagnostic handler was not called while loading module\n"); fprintf(stderr, "Diagnostic handler was not called while loading module\n");
} }
return 0; return 0;
} }