[llvm-branch-commits] [llvm-branch] r351543 - Merging r351426:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 18 02:57:19 2019
New Revision: 351543

URL: http://llvm.org/viewvc/llvm-project?rev=351543&view=rev
Log:
Merging r351426:
------------------------------------------------------------------------
r351426 | d0k | 2019-01-17 11:25:18 +0100 (Thu, 17 Jan 2019) | 1 line

[MC] Remove unused variable
------------------------------------------------------------------------

Modified:
    llvm/branches/release_80/   (props changed)
    llvm/branches/release_80/lib/MC/MCWin64EH.cpp

Propchange: llvm/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 18 02:57:19 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,351325,351344-351345,351349,351351,351370,351381,351421,351436,351475
+/llvm/trunk:155241,351325,351344-351345,351349,351351,351370,351381,351421,351426,351436,351475

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=351543&r1=351542&r2=351543&view=diff
==============================================================================
--- llvm/branches/release_80/lib/MC/MCWin64EH.cpp (original)
+++ llvm/branches/release_80/lib/MC/MCWin64EH.cpp Fri Jan 18 02:57:19 2019
@@ -517,7 +517,6 @@ static void ARM64EmitUnwindInfo(MCStream
     auto &EpilogInstrs = I.second;
     uint32_t CodeBytes = ARM64CountOfUnwindCodes(EpilogInstrs);
 
-    uint32_t NumUnwindCodes = EpilogInstrs.size();
     MCSymbol* MatchingEpilog =
       FindMatchingEpilog(EpilogInstrs, AddedEpilogs, info);
     if (MatchingEpilog) {