[all-commits] [llvm/llvm-project] 5881dc: Try to unbreak Win build differently after 9735198...

[Nico Weber via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 5881dcff7e76a68323edc8bb3c6e14420ad9cf7c
      https://github.com/llvm/llvm-project/commit/5881dcff7e76a68323edc8bb3c6e14420ad9cf7c
  Author: Nico Weber <thakis at chromium.org>
  Date:   2021-09-02 (Thu, 02 Sep 2021)

  Changed paths:
    M clang/lib/Driver/ToolChains/Arch/X86.cpp
    M llvm/include/llvm/ADT/StringMap.h
    M llvm/unittests/ADT/StringMapTest.cpp

  Log Message:
  -----------
  Try to unbreak Win build differently after 973519826edb76

Looks like the MS STL wants StringMapKeyIterator::operator*() to be const.
Return the result by copy instead of reference to do that.
Assigning to a hash map key iterator doesn't make sense anyways.

Also reverts 123f811fe5b0b which is now hopefully no longer needed.

Differential Revision: https://reviews.llvm.org/D109167