[dragonegg] r222350 - Update for LLVM API change to make Small(Ptr)Set::insert return pair<iterator, bool> as per the C++ standard's associative container concept.

NAKAMURA Takumi geek4civic at gmail.com
Wed Nov 19 04:28:09 PST 2014


Author: chapuni
Date: Wed Nov 19 06:28:08 2014
New Revision: 222350

URL: http://llvm.org/viewvc/llvm-project?rev=222350&view=rev
Log:
Update for LLVM API change to make Small(Ptr)Set::insert return pair<iterator, bool> as per the C++ standard's associative container concept.

Modified:
    dragonegg/trunk/src/Convert.cpp

Modified: dragonegg/trunk/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Convert.cpp?rev=222350&r1=222349&r2=222350&view=diff
==============================================================================
--- dragonegg/trunk/src/Convert.cpp (original)
+++ dragonegg/trunk/src/Convert.cpp Wed Nov 19 06:28:08 2014
@@ -2704,7 +2704,7 @@ void TreeToLLVM::EmitLandingPads() {
             for (tree type = c->type_list; type; type = TREE_CHAIN(type)) {
               Constant *TypeInfo = ConvertTypeInfo(TREE_VALUE(type));
               // No point in trying to catch a typeinfo that was already caught.
-              if (!AlreadyCaught.insert(TypeInfo))
+              if (!AlreadyCaught.insert(TypeInfo).second)
                 continue;
               LPadInst->addClause(TypeInfo);
             }
@@ -8798,7 +8798,7 @@ bool TreeToLLVM::EmitBuiltinCall(gimple
           for (tree type = c->type_list; type; type = TREE_CHAIN(type)) {
             Value *TypeInfo = ConvertTypeInfo(TREE_VALUE(type));
             // No point in trying to catch a typeinfo that was already caught.
-            if (!AlreadyCaught.insert(TypeInfo))
+            if (!AlreadyCaught.insert(TypeInfo).second)
               continue;
 
             TypeInfo = Builder.CreateBitCast(TypeInfo, Builder.getInt8PtrTy());





More information about the llvm-commits mailing list