[llvm-branch-commits] [llvm-branch] r363006 - Merging r351577:

Tom Stellard via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Mon Jun 10 16:25:01 PDT 2019


Author: tstellar
Date: Mon Jun 10 16:25:00 2019
New Revision: 363006

URL: http://llvm.org/viewvc/llvm-project?rev=363006&view=rev
Log:
Merging r351577:

------------------------------------------------------------------------
r351577 | ssijaric | 2019-01-18 11:34:20 -0800 (Fri, 18 Jan 2019) | 5 lines

Fix the buildbot issue introduced by r351421

The EXPENSIVE_CHECK x86_64 Windows buildbot is failing due to this change. Fix
the map access.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_80/lib/MC/MCWin64EH.cpp

Modified: llvm/branches/release_80/lib/MC/MCWin64EH.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/lib/MC/MCWin64EH.cpp?rev=363006&r1=363005&r2=363006&view=diff
==============================================================================
--- llvm/branches/release_80/lib/MC/MCWin64EH.cpp (original)
+++ llvm/branches/release_80/lib/MC/MCWin64EH.cpp Mon Jun 10 16:25:00 2019
@@ -522,7 +522,7 @@ static void ARM64EmitUnwindInfo(MCStream
     if (MatchingEpilog) {
       assert(EpilogInfo.find(MatchingEpilog) != EpilogInfo.end() &&
              "Duplicate epilog not found");
-      EpilogInfo[EpilogStart] = EpilogInfo[MatchingEpilog];
+      EpilogInfo[EpilogStart] = EpilogInfo.lookup(MatchingEpilog);
       // Clear the unwind codes in the EpilogMap, so that they don't get output
       // in the logic below.
       EpilogInstrs.clear();




More information about the llvm-branch-commits mailing list