From 3c62198c616226b7555fe9085bcbb3a05084e4e7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Wed, 3 Mar 2021 13:45:06 -0500
Subject: [PATCH] [libc++] NFC: Normalize links to bug reports

---
 libcxx/include/memory                                                 | 2 +-
 .../associative/map/PR28469_undefined_behavior_segfault.sh.cpp        | 2 +-
 libcxx/test/std/containers/associative/map/compare.pass.cpp           | 4 ++--
 .../std/containers/associative/map/map.access/index_tuple.pass.cpp    | 2 +-
 libcxx/test/std/containers/sequences/vector.bool/find.pass.cpp        | 2 +-
 libcxx/test/std/containers/unord/unord.map/compare.pass.cpp           | 4 ++--
 .../containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp    | 2 +-
 .../support.coroutines/end.to.end/bool_await_suspend.pass.cpp         | 2 +-
 .../language.support/support.coroutines/end.to.end/generator.pass.cpp | 2 +-
 .../input.streams/istream.unformatted/ignore_0xff.pass.cpp            | 2 +-
 .../iostream.format/output.streams/ostream.seeks/seekp.pass.cpp       | 2 +-
 .../iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp      | 2 +-
 .../streambuf.virtuals/streambuf.virt.put/xsputn.PR14074.pass.cpp     | 2 +-
 .../std/input.output/string.streams/stringstream.cons/string.pass.cpp | 2 +-
 libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp  | 2 +-
 libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp               | 2 +-
 libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp            | 2 +-
 libcxx/test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp     | 2 +-
 libcxx/test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp   | 2 +-
 libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp   | 4 ++--
 libcxx/test/std/re/re.traits/lookup_classname.pass.cpp                | 2 +-
 .../basic.string/string.modifiers/string_append/push_back.pass.cpp    | 2 +-
 .../test/std/thread/futures/futures.async/async_race.38682.pass.cpp   | 2 +-
 libcxx/test/std/thread/futures/futures.async/async_race.pass.cpp      | 2 +-
 .../func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp    | 2 +-
 .../function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp      | 2 +-
 .../bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp     | 2 +-
 .../function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp    | 2 +-
 .../function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp    | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/F_nullptr.pass.cpp    | 2 +-
 .../util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp | 4 ++--
 .../util.smartptr.shared.create/make_shared.pass.cpp                  | 4 ++--
 .../optional.object/optional.object.assign/assign_value.pass.cpp      | 2 +-
 .../tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp            | 2 +-
 .../test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp   | 2 +-
 libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp        | 2 +-
 libcxx/utils/libcxx/test/config.py                                    | 2 +-
 37 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/libcxx/include/memory b/libcxx/include/memory
index e15f736..3fa0f2c 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -2329,7 +2329,7 @@ uninitialized_move_n(_InputIt __first, _Size __n, _ForwardIt __first_res) {
 
 // NOTE: Relaxed and acq/rel atomics (for increment and decrement respectively)
 // should be sufficient for thread safety.
-// See https://bugs.llvm.org/show_bug.cgi?id=22803
+// See https://llvm.org/PR22803
 #if defined(__clang__) && __has_builtin(__atomic_add_fetch)          \
                        && defined(__ATOMIC_RELAXED)                  \
                        && defined(__ATOMIC_ACQ_REL)
diff --git a/libcxx/test/std/containers/associative/map/PR28469_undefined_behavior_segfault.sh.cpp b/libcxx/test/std/containers/associative/map/PR28469_undefined_behavior_segfault.sh.cpp
index 4181bc5..584b829 100644
--- a/libcxx/test/std/containers/associative/map/PR28469_undefined_behavior_segfault.sh.cpp
+++ b/libcxx/test/std/containers/associative/map/PR28469_undefined_behavior_segfault.sh.cpp
@@ -14,7 +14,7 @@
 // <map>
 
 // Previously this code caused a segfault when compiled at -O2 due to undefined
-// behavior in __tree. See https://bugs.llvm.org/show_bug.cgi?id=28469
+// behavior in __tree. See https://llvm.org/PR28469
 
 #include <functional>
 #include <map>
diff --git a/libcxx/test/std/containers/associative/map/compare.pass.cpp b/libcxx/test/std/containers/associative/map/compare.pass.cpp
index 1a582a0..31221b23 100644
--- a/libcxx/test/std/containers/associative/map/compare.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/compare.pass.cpp
@@ -12,8 +12,8 @@
 //           class Allocator = allocator<pair<const Key, T>>>
 // class map
 
-// https://bugs.llvm.org/show_bug.cgi?id=16538
-// https://bugs.llvm.org/show_bug.cgi?id=16549
+// https://llvm.org/PR16538
+// https://llvm.org/PR16549
 
 #include <map>
 #include <utility>
diff --git a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
index ce8e44c..4a31a74 100644
--- a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
@@ -14,7 +14,7 @@
 
 // mapped_type& operator[](const key_type& k);
 
-// https://bugs.llvm.org/show_bug.cgi?id=16542
+// https://llvm.org/PR16542
 
 #include <map>
 
diff --git a/libcxx/test/std/containers/sequences/vector.bool/find.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/find.pass.cpp
index 0c587e3..406aeba 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/find.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/find.pass.cpp
@@ -11,7 +11,7 @@
 
 // std::find with vector<bool>::iterator
 
-// https://bugs.llvm.org/show_bug.cgi?id=16816
+// https://llvm.org/PR16816
 
 #include <vector>
 #include <algorithm>
diff --git a/libcxx/test/std/containers/unord/unord.map/compare.pass.cpp b/libcxx/test/std/containers/unord/unord.map/compare.pass.cpp
index b9c0c2b..12364fa 100644
--- a/libcxx/test/std/containers/unord/unord.map/compare.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/compare.pass.cpp
@@ -12,8 +12,8 @@
 //           class Alloc = allocator<pair<const Key, T>>>
 // class unordered_map
 
-// https://bugs.llvm.org/show_bug.cgi?id=16538
-// https://bugs.llvm.org/show_bug.cgi?id=16549
+// https://llvm.org/PR16538
+// https://llvm.org/PR16549
 
 #include <unordered_map>
 #include <cassert>
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp
index 0465f59..5b504a6 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp
@@ -16,7 +16,7 @@
 
 // mapped_type& operator[](const key_type& k);
 
-// https://bugs.llvm.org/show_bug.cgi?id=16542
+// https://llvm.org/PR16542
 
 #include <unordered_map>
 #include <tuple>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
index f9f9f7b..f4eadfd 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// See https://bugs.llvm.org/show_bug.cgi?id=33271
+// See https://llvm.org/PR33271
 // UNSUPPORTED: ubsan
 
 #include <experimental/coroutine>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
index 2c1e229..cc1cabb 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// See https://bugs.llvm.org/show_bug.cgi?id=33271
+// See https://llvm.org/PR33271
 // UNSUPPORTED: ubsan
 
 #include <experimental/coroutine>
diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff.pass.cpp
index 16d5aea..2cd5e33 100644
--- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff.pass.cpp
@@ -11,7 +11,7 @@
 // basic_istream<charT,traits>&
 //    ignore(streamsize n = 1, int_type delim = traits::eof());
 
-// https://bugs.llvm.org/show_bug.cgi?id=16427
+// https://llvm.org/PR16427
 
 #include <sstream>
 #include <cassert>
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
index b6fb174..fcb6c8e 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
@@ -57,7 +57,7 @@ int main(int, char**)
         assert(seekpos_called == 2);
         assert(os.fail());
     }
-    { // See https://bugs.llvm.org/show_bug.cgi?id=21361
+    { // See https://llvm.org/PR21361
         seekpos_called = 0;
         testbuf<char> sb;
         std::ostream os(&sb);
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
index 06a6beb..7ca60b7 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
@@ -59,7 +59,7 @@ int main(int, char**)
         assert(seekoff_called == 2);
         assert(os.fail());
     }
-    { // See https://bugs.llvm.org/show_bug.cgi?id=21361
+    { // See https://llvm.org/PR21361
         seekoff_called = 0;
         testbuf<char> sb;
         std::ostream os(&sb);
diff --git a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.PR14074.pass.cpp b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.PR14074.pass.cpp
index 3c51bc2..86f9c15 100644
--- a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.PR14074.pass.cpp
+++ b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.PR14074.pass.cpp
@@ -13,7 +13,7 @@
 
 // streamsize xsputn(const char_type* s, streamsize n);
 
-// Test https://bugs.llvm.org/show_bug.cgi?id=14074. The bug is really inside
+// Test https://llvm.org/PR14074. The bug is really inside
 // basic_streambuf, but I can't seem to reproduce without going through one
 // of its derived classes.
 
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
index a3659ba..55d95df 100644
--- a/libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
+++ b/libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
@@ -57,7 +57,7 @@ int main(int, char**)
         ss << i << ' ' << 123;
         assert(ss.str() == L"456 1236 ");
     }
-    { // This is https://bugs.llvm.org/show_bug.cgi?id=33727
+    { // This is https://llvm.org/PR33727
         typedef std::basic_string   <char, std::char_traits<char>, NoDefaultAllocator<char> > S;
         typedef std::basic_stringbuf<char, std::char_traits<char>, NoDefaultAllocator<char> > SB;
 
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
index 291798cf..a680baf 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
@@ -15,7 +15,7 @@
 //                  const basic_regex<charT, traits>& e,
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
-// https://bugs.llvm.org/show_bug.cgi?id=16135
+// https://llvm.org/PR16135
 
 #include <string>
 #include <regex>
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp
index d27124a..22d5221 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp
@@ -24,7 +24,7 @@
 int main(int, char**)
 {
     // This regex_iterator uses regex_search(__wrap_iter<_Iter> __first, ...)
-    // Test for https://bugs.llvm.org/show_bug.cgi?id=16240 fixed in r185273.
+    // Test for https://llvm.org/PR16240 fixed in r185273.
     {
         std::string s("aaaa a");
         std::regex re("\\ba");
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp
index 7846eca..1a3ebfc 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp
@@ -15,7 +15,7 @@
 //                  const basic_regex<charT, traits>& e,
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
-// https://bugs.llvm.org/show_bug.cgi?id=11118
+// https://llvm.org/PR11118
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp b/libcxx/test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp
index ab718c5..e3909c7 100644
--- a/libcxx/test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp
+++ b/libcxx/test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp
@@ -39,7 +39,7 @@ int main(int, char**)
     assert(std::regex_constants::nosubs != 0);
     assert(std::regex_constants::optimize != 0);
     assert(std::regex_constants::collate != 0);
-#ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO  // https://bugs.llvm.org/show_bug.cgi?id=35967
+#ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO  // https://llvm.org/PR35967
     assert(std::regex_constants::ECMAScript != 0);
 #else
     assert(std::regex_constants::ECMAScript == 0);
diff --git a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
index ad65f7c..cf14ac6 100644
--- a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
+++ b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
@@ -94,7 +94,7 @@ int main(int, char**)
         assert((*i2).position() == 0);
         assert((*i2).str() == "555-1234");
     }
-    { // https://bugs.llvm.org/show_bug.cgi?id=33681
+    { // https://llvm.org/PR33681
         std::regex rex(".*");
         const char foo[] = "foo";
     //  The -1 is because we don't want the implicit null from the array.
diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
index 1021ebf..09b9e89 100644
--- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
+++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
@@ -52,7 +52,7 @@ int main(int, char**)
     assert(error_badbackref_thrown("\\800000000000000000000000000000", std::regex_constants::ECMAScript)); // overflows
 
 //  this should NOT throw, because we only should look at the '1'
-//  See https://bugs.llvm.org/show_bug.cgi?id=31387
+//  See https://llvm.org/PR31387
     {
     const char *pat1 = "a(b)c\\1234";
     std::regex re(pat1, pat1 + 7); // extra chars after the end.
@@ -76,7 +76,7 @@ int main(int, char**)
     assert(error_badbackref_thrown("\\(cat\\)\\10", std::regex::grep) == false);
     assert(error_badbackref_thrown("(cat)\\10", std::regex::egrep) == false);
 
-//  https://bugs.llvm.org/show_bug.cgi?id=34297
+//  https://llvm.org/PR34297
     assert(error_badbackref_thrown("(cat)\\1", std::regex::basic));
     assert(error_badbackref_thrown("\\(cat\\)\\1", std::regex::basic) == false);
     assert(error_badbackref_thrown("(cat)\\1", std::regex::extended) == false);
diff --git a/libcxx/test/std/re/re.traits/lookup_classname.pass.cpp b/libcxx/test/std/re/re.traits/lookup_classname.pass.cpp
index 38bafa6..63ae0ca 100644
--- a/libcxx/test/std/re/re.traits/lookup_classname.pass.cpp
+++ b/libcxx/test/std/re/re.traits/lookup_classname.pass.cpp
@@ -56,7 +56,7 @@ test_w(const char_type* A,
 int main(int, char**)
 {
 //  if __regex_word is not distinct from all the classes, bad things happen
-//  See https://bugs.llvm.org/show_bug.cgi?id=26476 for an example.
+//  See https://llvm.org/PR26476 for an example.
     LIBCPP_ASSERT((std::ctype_base::space  & std::regex_traits<char>::__regex_word) == 0);
     LIBCPP_ASSERT((std::ctype_base::print  & std::regex_traits<char>::__regex_word) == 0);
     LIBCPP_ASSERT((std::ctype_base::cntrl  & std::regex_traits<char>::__regex_word) == 0);
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
index f1b34ad..6da0384 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
@@ -49,7 +49,7 @@ int main(int, char**)
 #endif
 
     {
-// https://bugs.llvm.org/show_bug.cgi?id=31454
+// https://llvm.org/PR31454
     std::basic_string<veryLarge> s;
     veryLarge vl = {};
     s.push_back(vl);
diff --git a/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp b/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp
index fd1bc5b..8a4a39c 100644
--- a/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp
@@ -19,7 +19,7 @@
 // UNSUPPORTED: with_system_cxx_lib=macosx10.9
 
 // This test is designed to cause and allow TSAN to detect a race condition
-// in std::async, as reported in https://bugs.llvm.org/show_bug.cgi?id=38682.
+// in std::async, as reported in https://llvm.org/PR38682.
 
 #include <cassert>
 #include <functional>
diff --git a/libcxx/test/std/thread/futures/futures.async/async_race.pass.cpp b/libcxx/test/std/thread/futures/futures.async/async_race.pass.cpp
index 6cae1f4..9d69550 100644
--- a/libcxx/test/std/thread/futures/futures.async/async_race.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.async/async_race.pass.cpp
@@ -20,7 +20,7 @@
 //     async(launch policy, F&& f, Args&&... args);
 
 // This test is designed to cause and allow TSAN to detect the race condition
-// reported in PR23293: https://bugs.llvm.org/show_bug.cgi?id=23293
+// reported in PR23293: https://llvm.org/PR23293
 
 #include <future>
 #include <chrono>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
index deec51d..eeb87e0 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
@@ -15,7 +15,7 @@
 // template<Returnable R, CopyConstructible Fn, CopyConstructible... Types>
 //   unspecified bind(Fn, Types...);
 
-// https://bugs.llvm.org/show_bug.cgi?id=23141
+// https://llvm.org/PR23141
 #include <functional>
 #include <type_traits>
 
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
index 12aba89..3403d74 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
@@ -15,7 +15,7 @@
 // template<Returnable R, CopyConstructible Fn, CopyConstructible... Types>
 //   unspecified bind(Fn, Types...);
 
-// https://bugs.llvm.org/show_bug.cgi?id=16385
+// https://llvm.org/PR16385
 
 #include <functional>
 #include <cmath>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
index 6fdad13..d6f620d 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
@@ -15,7 +15,7 @@
 // template<Returnable R, CopyConstructible Fn, CopyConstructible... Types>
 //   unspecified bind(Fn, Types...);
 
-// https://bugs.llvm.org/show_bug.cgi?id=22003
+// https://llvm.org/PR22003
 
 #include <functional>
 
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
index bb9807e..76e9d84 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
@@ -15,7 +15,7 @@
 // template<Returnable R, CopyConstructible Fn, CopyConstructible... Types>
 //   unspecified bind(Fn, Types...);
 
-// https://bugs.llvm.org/show_bug.cgi?id=16343
+// https://llvm.org/PR16343
 
 #include <cmath>
 #include <functional>
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
index 67635db..a9e0373 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
@@ -10,7 +10,7 @@
 
 // <functional>
 
-// See https://bugs.llvm.org/show_bug.cgi?id=20002
+// See https://llvm.org/PR20002
 
 #include <functional>
 #include <type_traits>
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_nullptr.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_nullptr.pass.cpp
index 39f20b7..f0ce26b 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_nullptr.pass.cpp
@@ -13,7 +13,7 @@
 // function(Fp);
 
 // Ensure that __not_null works for all function types.
-// See https://bugs.llvm.org/show_bug.cgi?id=23589
+// See https://llvm.org/PR23589
 
 // This test runs in C++03, but we have deprecated using std::function in C++03.
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
index e403ea6..d6b4508 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
@@ -55,11 +55,11 @@ struct PrivateBase : private std::enable_shared_from_this<PrivateBase> {
 int main(int, char**)
 {
     globalMemCounter.reset();
-    {  // https://bugs.llvm.org/show_bug.cgi?id=18843
+    {  // https://llvm.org/PR18843
     std::shared_ptr<T const> t1(new T);
     std::shared_ptr<T const> t2(std::make_shared<T>());
     }
-    { // https://bugs.llvm.org/show_bug.cgi?id=27115
+    { // https://llvm.org/PR27115
     int x = 42;
     std::shared_ptr<Bar> t1(new Bar(42));
     assert(t1->shared_from_this() == t1);
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
index ebb1cdc..25355cb 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
@@ -63,7 +63,7 @@ static void resultDeletor(Result (*pf)()) {
 }
 
 void test_pointer_to_function() {
-    { // https://bugs.llvm.org/show_bug.cgi?id=27566
+    { // https://llvm.org/PR27566
       std::shared_ptr<Result()> x(&theFunction, &resultDeletor);
       std::shared_ptr<Result()> y(theFunction, resultDeletor);
     }
@@ -86,7 +86,7 @@ int main(int, char**)
     assert(p->get_char() == 'e');
     }
 
-    { // https://bugs.llvm.org/show_bug.cgi?id=24137
+    { // https://llvm.org/PR24137
     std::shared_ptr<Foo> p1       = std::make_shared<Foo>();
     assert(p1.get());
     std::shared_ptr<const Foo> p2 = std::make_shared<const Foo>();
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
index e4528ff..eaca111 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -241,7 +241,7 @@ enum MyEnum { Zero, One, Two, Three, FortyTwo = 42 };
 
 using Fn = void(*)();
 
-// https://bugs.llvm.org/show_bug.cgi?id=38638
+// https://llvm.org/PR38638
 template <class T>
 constexpr T pr38638(T v)
 {
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
index 584bf50..09a9bdf 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
@@ -90,7 +90,7 @@ int main(int, char**)
     // when both #1 and #2 participate in partial ordering #2 will always
     // be chosen over #1.
     // See PR22806  and LWG issue #2549 for more information.
-    // (https://bugs.llvm.org/show_bug.cgi?id=22806)
+    // (https://llvm.org/PR22806)
     using T = std::tuple<int>;
     std::allocator<int> A;
     { // rvalue reference
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
index 2df6ff7..5267f69 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
@@ -17,7 +17,7 @@
 
 // NOTE: this constructor does not currently support tags derived from
 // allocator_arg_t because libc++ has to deduce the parameter as a template
-// argument. See PR27684 (https://bugs.llvm.org/show_bug.cgi?id=27684)
+// argument. See PR27684 (https://llvm.org/PR27684)
 
 #include <tuple>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
index b88ecc0..676c5fc 100644
--- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
@@ -338,7 +338,7 @@ void test_exceptions() {
 #endif
 }
 
-// See https://bugs.llvm.org/show_bug.cgi?id=31916
+// See https://llvm.org/PR31916
 void test_caller_accepts_nonconst() {
   struct A {};
   struct Visitor {
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 3074463..7ab7606 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -524,7 +524,7 @@ class Configuration(object):
                 if llvm_symbolizer is not None:
                     self.exec_env['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer
                 # FIXME: Turn ODR violation back on after PR28391 is resolved
-                # https://bugs.llvm.org/show_bug.cgi?id=28391
+                # https://llvm.org/PR28391
                 self.exec_env['ASAN_OPTIONS'] = 'detect_odr_violation=0'
                 self.config.available_features.add('asan')
                 self.config.available_features.add('sanitizer-new-delete')
-- 
2.7.4