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 86e51a1c7974ced5e56c1443b47d91b35cb43f88..40893ea247f1d21f29879e1ff4e99a65212782fb 100644 (file)
--- 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);