Import LLVM 4.0.0 rc1 including clang and lld to help the current

development effort on OpenBSD/arm64.

1 files changed, 17 insertions, 4 deletions

diff --git a/gnu/llvm/unittests/MC/StringTableBuilderTest.cpp b/gnu/llvm/unittests/MC/StringTableBuilderTest.cpp
index f78d3588fff..f68350d90ba 100644
--- a/gnu/llvm/unittests/MC/StringTableBuilderTest.cpp
+++ b/gnu/llvm/unittests/MC/StringTableBuilderTest.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/SmallString.h"
 #include "llvm/MC/StringTableBuilder.h"
 #include "llvm/Support/Endian.h"
 #include "gtest/gtest.h"
@@ -32,7 +33,11 @@ TEST(StringTableBuilderTest, BasicELF) {
   Expected += "foo";
   Expected += '\x00';
 
-  EXPECT_EQ(Expected, B.data());
+  SmallString<64> Data;
+  raw_svector_ostream OS(Data);
+  B.write(OS);
+
+  EXPECT_EQ(Expected, Data);
   EXPECT_EQ(1U, B.getOffset("foobar"));
   EXPECT_EQ(4U, B.getOffset("bar"));
   EXPECT_EQ(8U, B.getOffset("foo"));
@@ -50,7 +55,7 @@ TEST(StringTableBuilderTest, BasicWinCOFF) {
 
   // size_field + "pygmy hippopotamus\0" + "river horse\0"
   uint32_t ExpectedSize = 4 + 19 + 12;
-  EXPECT_EQ(ExpectedSize, B.data().size());
+  EXPECT_EQ(ExpectedSize, B.getSize());
 
   std::string Expected;
 
@@ -62,7 +67,11 @@ TEST(StringTableBuilderTest, BasicWinCOFF) {
   Expected += "river horse";
   Expected += '\x00';
 
-  EXPECT_EQ(Expected, B.data());
+  SmallString<64> Data;
+  raw_svector_ostream OS(Data);
+  B.write(OS);
+
+  EXPECT_EQ(Expected, Data);
   EXPECT_EQ(4U, B.getOffset("pygmy hippopotamus"));
   EXPECT_EQ(10U, B.getOffset("hippopotamus"));
   EXPECT_EQ(23U, B.getOffset("river horse"));
@@ -85,7 +94,11 @@ TEST(StringTableBuilderTest, ELFInOrder) {
   Expected += "foobar";
   Expected += '\x00';
 
-  EXPECT_EQ(Expected, B.data());
+  SmallString<64> Data;
+  raw_svector_ostream OS(Data);
+  B.write(OS);
+
+  EXPECT_EQ(Expected, Data);
   EXPECT_EQ(1U, B.getOffset("foo"));
   EXPECT_EQ(5U, B.getOffset("bar"));
   EXPECT_EQ(9U, B.getOffset("foobar"));