[llvm-branch-commits] [llvm-branch] r195219 - Merging r195138:

[Bill Wendling]

Author: void
Date: Wed Nov 20 00:19:13 2013
New Revision: 195219

URL: http://llvm.org/viewvc/llvm-project?rev=195219&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/lib/CodeGen/StackMaps.cpp

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 20 00:19:13 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195193
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195193

Modified: llvm/branches/release_34/lib/CodeGen/StackMaps.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/CodeGen/StackMaps.cpp?rev=195219&r1=195218&r2=195219&view=diff
==============================================================================
--- llvm/branches/release_34/lib/CodeGen/StackMaps.cpp (original)
+++ llvm/branches/release_34/lib/CodeGen/StackMaps.cpp Wed Nov 20 00:19:13 2013
@@ -298,8 +298,7 @@ void StackMaps::serializeToStackMapSecti
         }
       }
       else {
-        assert((Loc.LocType != Location::Register
-                && Loc.LocType != Location::Register) &&
+        assert(Loc.LocType != Location::Register &&
                "Missing location register");
       }
       AP.OutStreamer.EmitIntValue(Loc.LocType, 1);