From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 20 Nov 2013 06:19:13 +0000 (+0000)
Subject: Merging r195138:
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3773bef110790fbeeb386b083bdf8ad16bbceb91;p=llvm

Merging r195138:
------------------------------------------------------------------------
r195138 | atrick | 2013-11-19 10:29:45 -0800 (Tue, 19 Nov 2013) | 3 lines

Obvious pasto survived a couple rounds of cleanup.

Caught by Aaron Ballman.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195219 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/StackMaps.cpp b/lib/CodeGen/StackMaps.cpp
index 86e51a1c797..40893ea247f 100644
--- a/lib/CodeGen/StackMaps.cpp
+++ b/lib/CodeGen/StackMaps.cpp
@@ -298,8 +298,7 @@ void StackMaps::serializeToStackMapSection() {
         }
       }
       else {
-        assert((Loc.LocType != Location::Register
-                && Loc.LocType != Location::Register) &&
+        assert(Loc.LocType != Location::Register &&
                "Missing location register");
       }
       AP.OutStreamer.EmitIntValue(Loc.LocType, 1);