merge main into amd-staging (llvm#1863)

Author: ranapratap55

bolt/lib/Rewrite/PseudoProbeRewriter.cpp

@@ -147,7 +147,7 @@ void PseudoProbeRewriter::parsePseudoProbe(bool ProfiledOnly) {
         if (!Name)
           continue;
         SymName = *Name;
-        uint64_t GUID = Function::getGUID(SymName);
+        uint64_t GUID = Function::getGUIDAssumingExternalLinkage(SymName);
         FuncStartAddrs[GUID] = F->getAddress();
         if (ProfiledOnly && HasProfile)
           GuidFilter.insert(GUID);
@@ -173,7 +173,7 @@ void PseudoProbeRewriter::parsePseudoProbe(bool ProfiledOnly) {
   const GUIDProbeFunctionMap &GUID2Func = ProbeDecoder.getGUID2FuncDescMap();
   // Checks GUID in GUID2Func and returns it if it's present or null otherwise.
   auto checkGUID = [&](StringRef SymName) -> uint64_t {
-    uint64_t GUID = Function::getGUID(SymName);
+    uint64_t GUID = Function::getGUIDAssumingExternalLinkage(SymName);
     if (GUID2Func.find(GUID) == GUID2Func.end())
       return 0;
     return GUID;
@@ -435,7 +435,7 @@ void PseudoProbeRewriter::encodePseudoProbes() {
     for (const BinaryFunction *F : BC.getAllBinaryFunctions()) {
       const uint64_t Addr =
           F->isEmitted() ? F->getOutputAddress() : F->getAddress();
-      FuncStartAddrs[Function::getGUID(
+      FuncStartAddrs[Function::getGUIDAssumingExternalLinkage(
           NameResolver::restore(F->getOneName()))] = Addr;
     }
     DummyDecoder.buildAddress2ProbeMap(

clang/include/clang/ASTMatchers/ASTMatchersInternal.h

@@ -881,20 +881,12 @@ inline bool isDefaultedHelper(const FunctionDecl *FD) {
 }
 
 // Metafunction to determine if type T has a member called getDecl.
-template <typename Ty>
-class has_getDecl {
-  using yes = char[1];
-  using no = char[2];
-
-  template <typename Inner>
-  static yes& test(Inner *I, decltype(I->getDecl()) * = nullptr);
-
-  template <typename>
-  static no& test(...);
+template <typename T>
+using check_has_getDecl = decltype(std::declval<T &>().getDecl());
 
-public:
-  static const bool value = sizeof(test<Ty>(nullptr)) == sizeof(yes);
-};
+template <typename T>
+static constexpr bool has_getDecl =
+    llvm::is_detected<check_has_getDecl, T>::value;
 
 /// Matches overloaded operators with a specific name.
 ///

clang/lib/Analysis/ThreadSafety.cpp

@@ -1231,25 +1231,6 @@ static const ValueDecl *getValueDecl(const Expr *Exp) {
   return nullptr;
 }
 
-namespace {
-
-template <typename Ty>
-class has_arg_iterator_range {
-  using yes = char[1];
-  using no = char[2];
-
-  template <typename Inner>
-  static yes& test(Inner *I, decltype(I->args()) * = nullptr);
-
-  template <typename>
-  static no& test(...);
-
-public:
-  static const bool value = sizeof(test<Ty>(nullptr)) == sizeof(yes);
-};
-
-} // namespace
-
 bool ThreadSafetyAnalyzer::inCurrentScope(const CapabilityExpr &CapE) {
   const threadSafety::til::SExpr *SExp = CapE.sexpr();
   assert(SExp && "Null expressions should be ignored");

clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp

@@ -226,11 +226,11 @@ TEST(HasDeclaration, HasDeclarationOfEnumType) {
 }
 
 TEST(HasDeclaration, HasGetDeclTraitTest) {
-  static_assert(internal::has_getDecl<TypedefType>::value,
+  static_assert(internal::has_getDecl<TypedefType>,
                 "Expected TypedefType to have a getDecl.");
-  static_assert(internal::has_getDecl<RecordType>::value,
+  static_assert(internal::has_getDecl<RecordType>,
                 "Expected RecordType to have a getDecl.");
-  static_assert(!internal::has_getDecl<TemplateSpecializationType>::value,
+  static_assert(!internal::has_getDecl<TemplateSpecializationType>,
                 "Expected TemplateSpecializationType to *not* have a getDecl.");
 }
 

lldb/tools/debugserver/source/MacOSX/MachProcess.h

@@ -34,7 +34,6 @@
 #include "MachVMMemory.h"
 #include "PThreadCondition.h"
 #include "PThreadEvent.h"
-#include "PThreadMutex.h"
 #include "RNBContext.h"
 #include "ThreadInfo.h"
 
@@ -413,7 +412,7 @@ class MachProcess {
   uint32_t m_stop_count; // A count of many times have we stopped
   pthread_t m_stdio_thread;   // Thread ID for the thread that watches for child
                               // process stdio
-  PThreadMutex m_stdio_mutex; // Multithreaded protection for stdio
+  std::recursive_mutex m_stdio_mutex; // Multithreaded protection for stdio
   std::string m_stdout_data;
 
   bool m_profile_enabled; // A flag to indicate if profiling is enabled
@@ -423,7 +422,7 @@ class MachProcess {
       m_profile_scan_type; // Indicates what needs to be profiled
   pthread_t
       m_profile_thread; // Thread ID for the thread that profiles the inferior
-  PThreadMutex
+  std::recursive_mutex
       m_profile_data_mutex; // Multithreaded protection for profile info data
   std::vector<std::string>
       m_profile_data; // Profile data, must be protected by m_profile_data_mutex
@@ -435,15 +434,16 @@ class MachProcess {
                                                            // caught when
                                                            // listening to the
                                                            // exception port
-  PThreadMutex m_exception_and_signal_mutex; // Multithreaded protection for
-                                             // exceptions and signals.
+  std::recursive_mutex
+      m_exception_and_signal_mutex; // Multithreaded protection for
+                                    // exceptions and signals.
 
   MachThreadList m_thread_list; // A list of threads that is maintained/updated
                                 // after each stop
   Genealogy m_activities; // A list of activities that is updated after every
                           // stop lazily
   nub_state_t m_state;    // The state of our process
-  PThreadMutex m_state_mutex; // Multithreaded protection for m_state
+  std::recursive_mutex m_state_mutex; // Multithreaded protection for m_state
   PThreadEvent m_events;      // Process related events in the child processes
                               // lifetime can be waited upon
   PThreadEvent m_private_events; // Used to coordinate running and stopping the

lldb/tools/debugserver/source/MacOSX/MachProcess.mm

@@ -522,19 +522,17 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options,
 MachProcess::MachProcess()
     : m_pid(0), m_cpu_type(0), m_child_stdin(-1), m_child_stdout(-1),
       m_child_stderr(-1), m_path(), m_args(), m_task(this),
-      m_flags(eMachProcessFlagsNone), m_stdio_thread(0),
-      m_stdio_mutex(PTHREAD_MUTEX_RECURSIVE), m_stdout_data(),
-      m_profile_enabled(false), m_profile_interval_usec(0), m_profile_thread(0),
-      m_profile_data_mutex(PTHREAD_MUTEX_RECURSIVE), m_profile_data(),
+      m_flags(eMachProcessFlagsNone), m_stdio_thread(0), m_stdio_mutex(),
+      m_stdout_data(), m_profile_enabled(false), m_profile_interval_usec(0),
+      m_profile_thread(0), m_profile_data_mutex(), m_profile_data(),
       m_profile_events(0, eMachProcessProfileCancel), m_thread_actions(),
-      m_exception_messages(),
-      m_exception_and_signal_mutex(PTHREAD_MUTEX_RECURSIVE), m_thread_list(),
-      m_activities(), m_state(eStateUnloaded),
-      m_state_mutex(PTHREAD_MUTEX_RECURSIVE), m_events(0, kAllEventsMask),
-      m_private_events(0, kAllEventsMask), m_breakpoints(), m_watchpoints(),
-      m_name_to_addr_callback(NULL), m_name_to_addr_baton(NULL),
-      m_image_infos_callback(NULL), m_image_infos_baton(NULL),
-      m_sent_interrupt_signo(0), m_auto_resume_signo(0), m_did_exec(false),
+      m_exception_messages(), m_exception_and_signal_mutex(), m_thread_list(),
+      m_activities(), m_state(eStateUnloaded), m_state_mutex(),
+      m_events(0, kAllEventsMask), m_private_events(0, kAllEventsMask),
+      m_breakpoints(), m_watchpoints(), m_name_to_addr_callback(NULL),
+      m_name_to_addr_baton(NULL), m_image_infos_callback(NULL),
+      m_image_infos_baton(NULL), m_sent_interrupt_signo(0),
+      m_auto_resume_signo(0), m_did_exec(false),
       m_dyld_process_info_create(nullptr),
       m_dyld_process_info_for_each_image(nullptr),
       m_dyld_process_info_release(nullptr),
@@ -577,7 +575,7 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options,
 
 nub_state_t MachProcess::GetState() {
   // If any other threads access this we will need a mutex for it
-  PTHREAD_MUTEX_LOCKER(locker, m_state_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_state_mutex);
   return m_state;
 }
 
@@ -1279,7 +1277,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) {
 
   // Scope for mutex locker
   {
-    PTHREAD_MUTEX_LOCKER(locker, m_state_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_state_mutex);
     const nub_state_t old_state = m_state;
 
     if (old_state == eStateExited) {
@@ -1338,7 +1336,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) {
   m_stop_count = 0;
   m_thread_list.Clear();
   {
-    PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
     m_exception_messages.clear();
     m_sent_interrupt_signo = 0;
     m_auto_resume_signo = 0;
@@ -1578,7 +1576,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 bool MachProcess::Interrupt() {
   nub_state_t state = GetState();
   if (IsRunning(state)) {
-    PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
     if (m_sent_interrupt_signo == 0) {
       m_sent_interrupt_signo = SIGSTOP;
       if (Signal(m_sent_interrupt_signo)) {
@@ -1736,7 +1734,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
     m_thread_actions.Append(thread_action);
     m_thread_actions.SetDefaultThreadActionIfNeeded(eStateRunning, 0);
 
-    PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
 
     ReplyToAllExceptions();
   }
@@ -1862,7 +1860,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 }
 
 void MachProcess::ReplyToAllExceptions() {
-  PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
   if (!m_exception_messages.empty()) {
     MachException::Message::iterator pos;
     MachException::Message::iterator begin = m_exception_messages.begin();
@@ -1896,7 +1894,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
   }
 }
 void MachProcess::PrivateResume() {
-  PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
 
   m_auto_resume_signo = m_sent_interrupt_signo;
   if (m_auto_resume_signo)
@@ -2298,7 +2296,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 // data has already been copied.
 void MachProcess::ExceptionMessageReceived(
     const MachException::Message &exceptionMessage) {
-  PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
 
   if (m_exception_messages.empty())
     m_task.Suspend();
@@ -2312,7 +2310,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 
 task_t MachProcess::ExceptionMessageBundleComplete() {
   // We have a complete bundle of exceptions for our child process.
-  PTHREAD_MUTEX_LOCKER(locker, m_exception_and_signal_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_exception_and_signal_mutex);
   DNBLogThreadedIf(LOG_EXCEPTIONS, "%s: %llu exception messages.",
                    __PRETTY_FUNCTION__, (uint64_t)m_exception_messages.size());
   bool auto_resume = false;
@@ -2495,7 +2493,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 void MachProcess::AppendSTDOUT(char *s, size_t len) {
   DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (<%llu> %s) ...", __FUNCTION__,
                    (uint64_t)len, s);
-  PTHREAD_MUTEX_LOCKER(locker, m_stdio_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_stdio_mutex);
   m_stdout_data.append(s, len);
   m_events.SetEvents(eEventStdioAvailable);
 
@@ -2506,7 +2504,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 size_t MachProcess::GetAvailableSTDOUT(char *buf, size_t buf_size) {
   DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%llu]) ...", __FUNCTION__,
                    static_cast<void *>(buf), (uint64_t)buf_size);
-  PTHREAD_MUTEX_LOCKER(locker, m_stdio_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_stdio_mutex);
   size_t bytes_available = m_stdout_data.size();
   if (bytes_available > 0) {
     if (bytes_available > buf_size) {
@@ -2733,7 +2731,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 
 void MachProcess::SignalAsyncProfileData(const char *info) {
   DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (%s) ...", __FUNCTION__, info);
-  PTHREAD_MUTEX_LOCKER(locker, m_profile_data_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_profile_data_mutex);
   m_profile_data.push_back(info);
   m_events.SetEvents(eEventProfileDataAvailable);
 
@@ -2744,7 +2742,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {
 size_t MachProcess::GetAsyncProfileData(char *buf, size_t buf_size) {
   DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%llu]) ...", __FUNCTION__,
                    static_cast<void *>(buf), (uint64_t)buf_size);
-  PTHREAD_MUTEX_LOCKER(locker, m_profile_data_mutex);
+  std::lock_guard<std::recursive_mutex> guard(m_profile_data_mutex);
   if (m_profile_data.empty())
     return 0;
 

llvm/examples/OrcV2Examples/LLJITWithThinLTOSummaries/LLJITWithThinLTOSummaries.cpp

@@ -77,7 +77,9 @@ class DuplicateDefinitionInSummary
 
   void log(raw_ostream &OS) const override {
     OS << "Duplicate symbol for global value '" << GlobalValueName
-       << "' (GUID: " << GlobalValue::getGUID(GlobalValueName) << ") in:\n";
+       << "' (GUID: "
+       << GlobalValue::getGUIDAssumingExternalLinkage(GlobalValueName)
+       << ") in:\n";
     for (const std::string &Path : ModulePaths) {
       OS << "    " << Path << "\n";
     }
@@ -110,8 +112,9 @@ class DefinitionNotFoundInSummary
   }
 
   void log(raw_ostream &OS) const override {
-    OS << "No symbol for global value '" << GlobalValueName
-       << "' (GUID: " << GlobalValue::getGUID(GlobalValueName) << ") in:\n";
+    OS << "No symbol for global value '" << GlobalValueName << "' (GUID: "
+       << GlobalValue::getGUIDAssumingExternalLinkage(GlobalValueName)
+       << ") in:\n";
     for (const std::string &Path : ModulePaths) {
       OS << "    " << Path << "\n";
     }
@@ -135,7 +138,8 @@ char DefinitionNotFoundInSummary::ID = 0;
 Expected<StringRef> getMainModulePath(StringRef FunctionName,
                                       ModuleSummaryIndex &Index) {
   // Summaries use unmangled names.
-  GlobalValue::GUID G = GlobalValue::getGUID(FunctionName);
+  GlobalValue::GUID G =
+      GlobalValue::getGUIDAssumingExternalLinkage(FunctionName);
   ValueInfo VI = Index.getValueInfo(G);
 
   // We need a unique definition, otherwise don't try further.

llvm/include/llvm/CodeGen/ByteProvider.h

@@ -17,6 +17,7 @@
 #ifndef LLVM_CODEGEN_BYTEPROVIDER_H
 #define LLVM_CODEGEN_BYTEPROVIDER_H
 
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/DataTypes.h"
 #include <optional>
 #include <type_traits>
@@ -35,22 +36,14 @@ template <typename ISelOp> class ByteProvider {
 
   // TODO -- use constraint in c++20
   // Does this type correspond with an operation in selection DAG
-  template <typename T> class is_op {
-  private:
-    using yes = std::true_type;
-    using no = std::false_type;
+  // Only allow classes with member function getOpcode
+  template <typename U>
+  using check_has_getOpcode =
+      decltype(std::declval<std::remove_pointer_t<U> &>().getOpcode());
 
-    // Only allow classes with member function getOpcode
-    template <typename U>
-    static auto test(int) -> decltype(std::declval<U>().getOpcode(), yes());
-
-    template <typename> static no test(...);
-
-  public:
-    using remove_pointer_t = typename std::remove_pointer<T>::type;
-    static constexpr bool value =
-        std::is_same<decltype(test<remove_pointer_t>(0)), yes>::value;
-  };
+  template <typename U>
+  static constexpr bool has_getOpcode =
+      is_detected<check_has_getOpcode, U>::value;
 
 public:
   // For constant zero providers Src is set to nullopt. For actual providers
@@ -66,7 +59,7 @@ template <typename ISelOp> class ByteProvider {
 
   static ByteProvider getSrc(std::optional<ISelOp> Val, int64_t ByteOffset,
                              int64_t VectorOffset) {
-    static_assert(is_op<ISelOp>().value,
+    static_assert(has_getOpcode<ISelOp>,
                   "ByteProviders must contain an operation in selection DAG.");
     return ByteProvider(Val, ByteOffset, VectorOffset);
   }

llvm/include/llvm/CodeGen/PBQP/Math.h

@@ -25,8 +25,6 @@ using PBQPNum = float;
 
 /// PBQP Vector class.
 class Vector {
-  friend hash_code hash_value(const Vector &);
-
 public:
   /// Construct a PBQP vector of the given size.
   explicit Vector(unsigned Length) : Data(Length) {}
@@ -96,7 +94,7 @@ class Vector {
 inline hash_code hash_value(const Vector &V) {
   const unsigned *VBegin = reinterpret_cast<const unsigned *>(V.begin());
   const unsigned *VEnd = reinterpret_cast<const unsigned *>(V.end());
-  return hash_combine(V.Data.size(), hash_combine_range(VBegin, VEnd));
+  return hash_combine(V.getLength(), hash_combine_range(VBegin, VEnd));
 }
 
 /// Output a textual representation of the given vector on the given