Merge tag 'llvmorg-16.0.6' of https://github.com/llvm/llvm-project in…

…to llvm-16.x Tag 16.0.6 # -----BEGIN PGP SIGNATURE----- # # iQJIBAABCAAyFiEER04iMWq/R4WojG6OoseUqYZBnYoFAmSJKYsUHHRzdGVsbGFy # QHJlZGhhdC5jb20ACgkQoseUqYZBnYqrWg/9EOdz56cjWPwscqPfyWu1CFmDbb/B # sTrtH0Mh58eBKoEapikcDaEosCdf8hCEk1CXW4qrZ4MCnTzWxFHlcUkCW+nCSS93 # /gsYq0/V7s42M4J3jEFb7lhBFhzXskxY/9O3jBPhYO9jNHqejO67Uq191DaT39qV # oJTW4y+9uDrHnVBW6cKOqwnbM066Oq0xrjHLH5Yz0BGzA3V1Y+twnwC+vK2H40YI # ZezkvOn+BuSuYn1HbTNdlT9Hok4KemWMyX3PwI+W91P2OnhwlYtx1gphn/x+0GCQ # Yr9iyRtnqIC1CrZV5d0xPIpE6KBzrPiJWtE3V35t/OhNTJ+QmTf+n7abHjnRNImh # iolSUkoohkssgF7EFlV/PvSug5Emc+irX9JkYFkcIsM9PAaTSVxwkbMayigrt6ki # 0DjX0j0PuIDN8ZOQPTgnFkbTnbp5IKqe6ooqI7sXKbHZHbQ8iyTc+TF3kzH1R3A3 # vCX/Z0O71tgHZuAxR9y7ffT9uBwqLepvrNy8BS/HYWncNsTPhffvllrtpPV/agvw # iLlmRIFklLHmIFgzWRe/VkgRuqbR5v1MmZk8Zpvhjd53ShNuUro9TtnVtV5dFw8Z # 7ywlTEBeGQ49gJeEynDoxvMN4qmXa16/m6Y/kddZzHs1E+m74/WGAoZcmRVlRIK0 # 1U54ZGqdNvuxKmo= # =+wF+ # -----END PGP SIGNATURE----- # gpg: Signature made 2023/6/14 10:44:27 ̨±±±ê׼ʱ¼ä # gpg: using RSA key 474E22316ABF4785A88C6E8EA2C794A986419D8A # gpg: issuer "[email protected]" # gpg: Can't check signature: No public key
KomiMoe · Jun 20, 2023 · 1d0430f · 1d0430f
2 parents 82aaa4b + 7cbf1a2
commit 1d0430f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/libcxx/include/__config b/libcxx/include/__config
@@ -38,7 +38,7 @@
 // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.
 // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is
 // defined to XXYYZZ.
-#  define _LIBCPP_VERSION 160005
+#  define _LIBCPP_VERSION 160006
 
 #  define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
 #  define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)

diff --git a/lld/test/wasm/Inputs/.gitattributes b/lld/test/wasm/Inputs/.gitattributes
@@ -0,0 +1,3 @@
+# ensures that we test parsing of stub libraries that contain
+# windows line endings
+libstub.so text eol=crlf
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
@@ -281,7 +281,7 @@ void LinkerDriver::addFile(StringRef path) {
     files.push_back(createObjectFile(mbref));
     break;
   case file_magic::unknown:
-    if (mbref.getBuffer().starts_with("#STUB\n")) {
+    if (mbref.getBuffer().starts_with("#STUB")) {
       files.push_back(make<StubFile>(mbref));
       break;
     }

diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp
@@ -691,12 +691,16 @@ StringRef strip(StringRef s) {
 }
 
 void StubFile::parse() {
-  bool first = false;
+  bool first = true;
+
+  SmallVector<StringRef> lines;
+  mb.getBuffer().split(lines, '\n');
+  for (StringRef line : lines) {
+    line = line.trim();
 
-  for (StringRef line : args::getLines(mb)) {
     // File must begin with #STUB
     if (first) {
-      assert(line == "#STUB\n");
+      assert(line == "#STUB");
       first = false;
     }
 
@@ -713,10 +717,10 @@ void StubFile::parse() {
     symbolDependencies[sym] = {};
 
     while (rest.size()) {
-      StringRef first;
-      std::tie(first, rest) = rest.split(',');
-      first = strip(first);
-      symbolDependencies[sym].push_back(first);
+      StringRef dep;
+      std::tie(dep, rest) = rest.split(',');
+      dep = strip(dep);
+      symbolDependencies[sym].push_back(dep);
     }
   }
 }

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
-  set(LLVM_VERSION_PATCH 5)
+  set(LLVM_VERSION_PATCH 6)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
   set(LLVM_VERSION_SUFFIX)

diff --git a/llvm/utils/gn/secondary/llvm/version.gni b/llvm/utils/gn/secondary/llvm/version.gni
@@ -1,4 +1,4 @@
 llvm_version_major = 16
 llvm_version_minor = 0
-llvm_version_patch = 5
+llvm_version_patch = 6
 llvm_version = "$llvm_version_major.$llvm_version_minor.$llvm_version_patch"
diff --git a/llvm/utils/lit/lit/__init__.py b/llvm/utils/lit/lit/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = 'Daniel Dunbar'
 __email__ = '[email protected]'
-__versioninfo__ = (16, 0, 5)
+__versioninfo__ = (16, 0, 6)
 __version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev'
 
 __all__ = []