[TextAPI] Update reader to be supported by lib/Object
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
diff --git a/llvm/unittests/TextAPI/TextStubV3Tests.cpp b/llvm/unittests/TextAPI/TextStubV3Tests.cpp
index 9504ec4..9904e7b 100644
--- a/llvm/unittests/TextAPI/TextStubV3Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV3Tests.cpp
@@ -88,8 +88,7 @@
" thread-local-symbols: [ _tlv3 ]\n"
"...\n";
- auto Buffer = MemoryBuffer::getMemBuffer(tbd_v3_file1, "Test.tbd");
- auto Result = TextAPIReader::get(std::move(Buffer));
+ auto Result = TextAPIReader::get(MemoryBufferRef(tbd_v3_file1, "Test.tbd"));
EXPECT_TRUE(!!Result);
auto File = std::move(Result.get());
EXPECT_EQ(FileType::TBD_V3, File->getFileType());
@@ -188,8 +187,8 @@
"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_V3, File->getFileType());
@@ -203,8 +202,8 @@
"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_V3, File->getFileType());
@@ -218,8 +217,8 @@
"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_V3, File->getFileType());
@@ -233,8 +232,8 @@
"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_V3, File->getFileType());
@@ -248,9 +247,8 @@
"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_V3, File->getFileType());
@@ -265,8 +263,8 @@
"swift-abi-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_V3, File->getFileType());
@@ -281,8 +279,8 @@
"swift-abi-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_V3, File->getFileType());
@@ -297,8 +295,8 @@
"swift-abi-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_V3, File->getFileType());
@@ -313,8 +311,8 @@
"swift-abi-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_V3, File->getFileType());
@@ -329,8 +327,8 @@
"swift-abi-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:20: error: invalid Swift ABI "
@@ -346,8 +344,7 @@
"swift-abi-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_V3, File->getFileType());
@@ -362,8 +359,8 @@
"swift-abi-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_V3, File->getFileType());
@@ -378,9 +375,8 @@
"install-name: Test.dylib\n"
"...\n";
- auto Buffer =
- MemoryBuffer::getMemBuffer(tbd_v3_file_unknown_architecture, "Test.tbd");
- auto Result = TextAPIReader::get(std::move(Buffer));
+ auto Result = TextAPIReader::get(
+ MemoryBufferRef(tbd_v3_file_unknown_architecture, "Test.tbd"));
EXPECT_TRUE(!!Result);
}
@@ -390,9 +386,8 @@
"platform: newOS\n"
"...\n";
- auto Buffer =
- MemoryBuffer::getMemBuffer(tbd_v3_file_unknown_platform, "Test.tbd");
- auto Result = TextAPIReader::get(std::move(Buffer));
+ auto Result = TextAPIReader::get(
+ MemoryBufferRef(tbd_v3_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: "
@@ -406,8 +401,8 @@
"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 "
@@ -423,8 +418,8 @@
"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(