try a different fix for test on Windows

Created using spr 1.3.6

Author: cachemeifyoucan

clang/lib/Headers/hlsl/hlsl_alias_intrinsics.h

@@ -2190,10 +2190,10 @@ float4 sqrt(float4);
 // step builtins
 //===----------------------------------------------------------------------===//
 
-/// \fn T step(T x, T y)
+/// \fn T step(T y, T x)
 /// \brief Returns 1 if the x parameter is greater than or equal to the y
-/// parameter; otherwise, 0. vector. \param x [in] The first floating-point
-/// value to compare. \param y [in] The first floating-point value to compare.
+/// parameter; otherwise, 0. vector. \param y [in] The first floating-point
+/// value to compare. \param x [in] The second floating-point value to compare.
 ///
 /// Step is based on the following formula: (x >= y) ? 1 : 0
 

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp

@@ -98,17 +98,7 @@ struct InitializePythonRAII {
 #ifdef LLDB_USE_LIBEDIT_READLINE_COMPAT_MODULE
       // Python's readline is incompatible with libedit being linked into lldb.
       // Provide a patched version local to the embedded interpreter.
-      bool ReadlinePatched = false;
-      for (auto *p = PyImport_Inittab; p->name != nullptr; p++) {
-        if (strcmp(p->name, "readline") == 0) {
-          p->initfunc = initlldb_readline;
-          break;
-        }
-      }
-      if (!ReadlinePatched) {
-        PyImport_AppendInittab("readline", initlldb_readline);
-        ReadlinePatched = true;
-      }
+      PyImport_AppendInittab("readline", initlldb_readline);
 #endif
 
       // Register _lldb as a built-in module.

llvm/lib/Transforms/Scalar/JumpTableToSwitch.cpp

@@ -149,9 +149,8 @@ expandToSwitch(CallBase *CB, const JumpTableTy &JT, DomTreeUpdater &DTU,
         std::numeric_limits<uint32_t>::max(), TotalCount);
 
     for (const auto &[G, C] : Targets) {
-      auto It = GuidToCounter.insert({G, C});
+      [[maybe_unused]] auto It = GuidToCounter.insert({G, C});
       assert(It.second);
-      (void)It;
     }
   }
   for (auto [Index, Func] : llvm::enumerate(JT.Funcs)) {

llvm/unittests/Support/Path.cpp

@@ -1473,7 +1473,9 @@ TEST_F(FileSystemTest, FileMapping) {
 
 TEST_F(FileSystemTest, FileMappingSync) {
   // Create a temp file.
-  auto TempFileOrError = fs::TempFile::create(TestDirectory + "/test-%%%%");
+  SmallString<0> TempPath(TestDirectory);
+  sys::path::append(TempPath, "test-%%%%");
+  auto TempFileOrError = fs::TempFile::create(TempPath);
   ASSERT_TRUE((bool)TempFileOrError);
   fs::TempFile File = std::move(*TempFileOrError);
   StringRef Content("hello there");
@@ -1488,13 +1490,12 @@ TEST_F(FileSystemTest, FileMappingSync) {
     ASSERT_NO_ERROR(EC);
     std::copy(Content.begin(), Content.end(), MFR.data());
 
-    // Synchronize.
+    // Synchronize and check the contents before unmapping.
     MFR.sync();
+    auto Buffer = MemoryBuffer::getFile(File.TmpName);
+    ASSERT_TRUE((bool)Buffer);
+    ASSERT_EQ(Content, Buffer->get()->getBuffer());
   }
-
-  auto Buffer = MemoryBuffer::getFile(File.TmpName);
-  ASSERT_TRUE((bool)Buffer);
-  ASSERT_EQ(Content, Buffer->get()->getBuffer());
   ASSERT_FALSE((bool)File.discard());
 }