Skip to content

Commit

Permalink
[TextAPI] Update reader to be supported by lib/Object
Browse files Browse the repository at this point in the history 
Summary:
To be able to use the TextAPI/Reader for tbd file consumption (by libObject)
it gets passed a MemoryBufferRef which isn't castable to MemoryBuffer.
Updated the tests to expect that input as well.

Reviewers: ributzka, steven_wu

Reviewed By: steven_wu

Subscribers: hiraditya, dexonsmith, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D66147

llvm-svn: 369119
  • Loading branch information
@cyndyishida
cyndyishida committed Aug 16, 2019
1 parent b782e61 commit 5f865ec
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 122 deletions.
5 changes: 1 addition & 4 deletions llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
View file
Expand Up @@ -20,10 +20,7 @@ class InterfaceFile;
class TextAPIReader {
public:
static Expected<std::unique_ptr<InterfaceFile>>
get(std::unique_ptr<MemoryBuffer> InputBuffer);

static Expected<std::unique_ptr<InterfaceFile>>
getUnmanaged(llvm::MemoryBuffer *InputBuffer);
get(MemoryBufferRef InputBuffer);

TextAPIReader() = delete;
};
Expand Down
8 changes: 5 additions & 3 deletions llvm/lib/TextAPI/MachO/TextStub.cpp
View file
Expand Up @@ -623,15 +623,17 @@ static void DiagHandler(const SMDiagnostic &Diag, void *Context) {
}

Expected<std::unique_ptr<InterfaceFile>>
TextAPIReader::get(std::unique_ptr<MemoryBuffer> InputBuffer) {
TextAPIReader::get(MemoryBufferRef InputBuffer) {
TextAPIContext Ctx;
Ctx.Path = InputBuffer->getBufferIdentifier();
yaml::Input YAMLIn(InputBuffer->getBuffer(), &Ctx, DiagHandler, &Ctx);
Ctx.Path = InputBuffer.getBufferIdentifier();
yaml::Input YAMLIn(InputBuffer.getBuffer(), &Ctx, DiagHandler, &Ctx);

// Fill vector with interface file objects created by parsing the YAML file.
std::vector<const InterfaceFile *> Files;
YAMLIn >> Files;

// YAMLIn dynamically allocates for Interface file and in case of error,
// memory leak will occur unless wrapped around unique_ptr
auto File = std::unique_ptr<InterfaceFile>(
const_cast<InterfaceFile *>(Files.front()));

Expand Down
72 changes: 33 additions & 39 deletions llvm/unittests/TextAPI/TextStubV1Tests.cpp
View file
Expand Up @@ -82,8 +82,7 @@ TEST(TBDv1, ReadFile) {
" thread-local-symbols: [ _tlv3 ]\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_file1, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result = TextAPIReader::get(MemoryBufferRef(tbd_v1_file1, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand Down Expand Up @@ -127,8 +126,7 @@ TEST(TBDv1, ReadFile2) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_file2, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result = TextAPIReader::get(MemoryBufferRef(tbd_v1_file2, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand Down Expand Up @@ -205,8 +203,8 @@ TEST(TBDv1, Platform_macOS) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_macos, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_platform_macos, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -220,8 +218,8 @@ TEST(TBDv1, Platform_iOS) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_ios, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_platform_ios, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -235,8 +233,8 @@ TEST(TBDv1, Platform_watchOS) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_watchos, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_platform_watchos, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -250,8 +248,8 @@ TEST(TBDv1, Platform_tvOS) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_tvos, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_platform_tvos, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -265,9 +263,8 @@ TEST(TBDv1, Platform_bridgeOS) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer =
MemoryBuffer::getMemBuffer(tbd_v1_platform_bridgeos, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_platform_bridgeos, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -282,8 +279,8 @@ TEST(TBDv1, Swift_1_0) {
"swift-version: 1.0\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_0, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_1_0, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -298,8 +295,8 @@ TEST(TBDv1, Swift_1_1) {
"swift-version: 1.1\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_1, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_1_1, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -314,8 +311,8 @@ TEST(TBDv1, Swift_2_0) {
"swift-version: 2.0\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_2_0, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_2_0, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -330,8 +327,8 @@ TEST(TBDv1, Swift_3_0) {
"swift-version: 3.0\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_3_0, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_3_0, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -346,8 +343,8 @@ TEST(TBDv1, Swift_4_0) {
"swift-version: 4.0\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_4_0, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_4_0, "Test.tbd"));
EXPECT_FALSE(!!Result);
auto errorMessage = toString(Result.takeError());
EXPECT_EQ("malformed file\nTest.tbd:5:16: error: invalid Swift ABI "
Expand All @@ -363,8 +360,7 @@ TEST(TBDv1, Swift_5) {
"swift-version: 5\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_5, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result = TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_5, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -379,8 +375,8 @@ TEST(TBDv1, Swift_99) {
"swift-version: 99\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_99, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(tbd_v1_swift_99, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V1, File->getFileType());
Expand All @@ -395,9 +391,8 @@ TEST(TBDv1, UnknownArchitecture) {
"install-name: Test.dylib\n"
"...\n";

auto Buffer =
MemoryBuffer::getMemBuffer(tbd_v1_file_unknown_architecture, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result = TextAPIReader::get(
MemoryBufferRef(tbd_v1_file_unknown_architecture, "Test.tbd"));
EXPECT_TRUE(!!Result);
}

Expand All @@ -407,9 +402,8 @@ TEST(TBDv1, UnknownPlatform) {
"platform: newOS\n"
"...\n";

auto Buffer =
MemoryBuffer::getMemBuffer(tbd_v1_file_unknown_platform, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result = TextAPIReader::get(
MemoryBufferRef(tbd_v1_file_unknown_platform, "Test.tbd"));
EXPECT_FALSE(!!Result);
auto errorMessage = toString(Result.takeError());
EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "
Expand All @@ -423,8 +417,8 @@ TEST(TBDv1, MalformedFile1) {
"foobar: \"Unsupported key\"\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(malformed_file1, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(malformed_file1, "Test.tbd"));
EXPECT_FALSE(!!Result);
auto errorMessage = toString(Result.takeError());
ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "
Expand All @@ -440,8 +434,8 @@ TEST(TBDv1, MalformedFile2) {
"foobar: \"Unsupported key\"\n"
"...\n";

auto Buffer = MemoryBuffer::getMemBuffer(malformed_file2, "Test.tbd");
auto Result = TextAPIReader::get(std::move(Buffer));
auto Result =
TextAPIReader::get(MemoryBufferRef(malformed_file2, "Test.tbd"));
EXPECT_FALSE(!!Result);
auto errorMessage = toString(Result.takeError());
ASSERT_EQ(
Expand Down

0 comments on commit 5f865ec

Please sign in to comment.