Reland "Try to unbreak Win build differently after 973519826edb76""

[GMNGeoffrey]

Summary

Build should be fixed by
https://github.com/llvm/llvm-project/commit/9d22754389

This reverts commit df052e1732ab57f5d9c684ceeaed3ab39073cd9f.

[thakis]

Thanks!

[GMNGeoffrey]

Hmmm so pre-merge checks on Linux are failing

https://buildkite.com/llvm-project/premerge-checks/builds/54955#8fea4a06-e971-48ad-a6d7-31173315d83d

FAIL: libomp :: lock/omp_init_lock.c (84929 of 87948)
******************** TEST 'libomp :: lock/omp_init_lock.c' FAILED ********************
Script:
--
: 'RUN: at line 1';   /var/lib/buildkite-agent/builds/llvm-project/build/./bin/clang -fopenmp -pthread -fno-experimental-isel  -I /var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test -I /var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/src -L /var/lib/buildkite-agent/builds/llvm-project/build/lib  -I /var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test/ompt /var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test/lock/omp_init_lock.c -o /var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/test/lock/Output/omp_init_lock.c.tmp -lm -latomic && /var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/test/lock/Output/omp_init_lock.c.tmp
--
Exit Code: -11
 
Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "/var/lib/buildkite-agent/builds/llvm-project/build/./bin/clang" "-fopenmp" "-pthread" "-fno-experimental-isel" "-I" "/var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test" "-I" "/var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/src" "-L" "/var/lib/buildkite-agent/builds/llvm-project/build/lib" "-I" "/var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test/ompt" "/var/lib/buildkite-agent/builds/llvm-project/openmp/runtime/test/lock/omp_init_lock.c" "-o" "/var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/test/lock/Output/omp_init_lock.c.tmp" "-lm" "-latomic"
$ "/var/lib/buildkite-agent/builds/llvm-project/build/projects/openmp/runtime/test/lock/Output/omp_init_lock.c.tmp"
note: command had no output on stdout or stderr
error: command failed with exit status: -11

[thakis]

In D109181#2981093, @GMNGeoffrey wrote:

Hmmm so pre-merge checks on Linux are failing

https://buildkite.com/llvm-project/premerge-checks/builds/54955#8fea4a06-e971-48ad-a6d7-31173315d83d

I can't repro this locally. I re-ran pre-merge checks here D109200 (=> https://buildkite.com/llvm-project/premerge-checks/builds/54996#5ef72074-ab0b-4e31-8194-6c460afc4b6b) and only the tests mentioned on https://reviews.llvm.org/D108884#2981158 are failing in that run, so I think that's probably some unrelated flake.

[GMNGeoffrey]

I can't repro the failure locally and it appears to also be broken at head

clang/lib/Driver/ToolChains/Arch/X86.cpp

if (Triple.getArch() == llvm::Triple::x86) {
       ArchMap.insert({
           {"IA32", "i386"},
           {"SSE", "pentium3"},
           {"SSE2", "pentium4"},
       });
     }
     StringRef CPU = ArchMap.lookup(A->getValue());
     if (CPU.empty()) {
-      std::vector<StringRef> ValidArchs;
-      for (StringRef Key : ArchMap.keys())
-        ValidArchs.push_back(Key);
+      std::vector<StringRef> ValidArchs{ArchMap.keys().begin(),
+                                        ArchMap.keys().end()};
       sort(ValidArchs);
       D.Diag(diag::warn_drv_invalid_arch_name_with_suggestion)
           << A->getValue() << (Triple.getArch() == llvm::Triple::x86)
           << join(ValidArchs, ", ");
     }
     return std::string(CPU);
   }
 

llvm/include/llvm/ADT/StringMap.h

using base = iterator_adaptor_base<StringMapKeyIterator<ValueTy>,
                                      StringMapConstIterator<ValueTy>,
                                      std::forward_iterator_tag, StringRef>;
 
 public:
   StringMapKeyIterator() = default;
   explicit StringMapKeyIterator(StringMapConstIterator<ValueTy> Iter)
       : base(std::move(Iter)) {}
 
-  StringRef &operator*() {
-    Key = this->wrapped()->getKey();
-    return Key;
-  }
-
-private:
-  StringRef Key;
+  StringRef operator*() const { return this->wrapped()->getKey(); }
 };
 
 } // end namespace llvm
 
 #endif // LLVM_ADT_STRINGMAP_H

llvm/unittests/ADT/StringMapTest.cpp

TEST_F(StringMapTest, InsertOrAssignTest) {
   EXPECT_FALSE(try2.second);
   EXPECT_EQ(2, try2.first->second.v);
   EXPECT_EQ(2, try1.first->second.move);
 
   EXPECT_EQ(try1.first, try2.first);
   EXPECT_EQ(0, try1.first->second.copy);
 }
 
-TEST_F(StringMapTest, IterMapKeys) {
+TEST_F(StringMapTest, IterMapKeysVector) {
+  StringMap<int> Map;
+  Map["A"] = 1;
+  Map["B"] = 2;
+  Map["C"] = 3;
+  Map["D"] = 3;
+
+  std::vector<StringRef> Keys{Map.keys().begin(), Map.keys().end()};
+  llvm::sort(Keys);
+
+  std::vector<StringRef> Expected{{"A", "B", "C", "D"}};
+  EXPECT_EQ(Expected, Keys);
+}
+
+TEST_F(StringMapTest, IterMapKeysSmallVector) {
   StringMap<int> Map;
   Map["A"] = 1;
   Map["B"] = 2;
   Map["C"] = 3;
   Map["D"] = 3;
 
   auto Keys = to_vector<4>(Map.keys());
   llvm::sort(Keys);