[polly] r215624 - Do not assert when trying to replace the log with another log

Andreas Simbuerger simbuerg at fim.uni-passau.de
Thu Aug 14 01:53:09 PDT 2014


Author: simbuerg
Date: Thu Aug 14 03:53:09 2014
New Revision: 215624

URL: http://llvm.org/viewvc/llvm-project?rev=215624&view=rev
Log:
Do not assert when trying to replace the log with another log

This usually happens when TempScopInfo calls isMaxRegionInScop(..),
so don't fail there.

Modified:
    polly/trunk/include/polly/ScopDetectionDiagnostic.h

Modified: polly/trunk/include/polly/ScopDetectionDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopDetectionDiagnostic.h?rev=215624&r1=215623&r2=215624&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopDetectionDiagnostic.h (original)
+++ polly/trunk/include/polly/ScopDetectionDiagnostic.h Thu Aug 14 03:53:09 2014
@@ -194,9 +194,9 @@ public:
   const_iterator begin() const { return Logs.begin(); }
   const_iterator end() const { return Logs.end(); }
 
-  void insert(std::pair<const Region *, RejectLog> New) {
-    auto Result = Logs.insert(New);
-    assert(Result.second && "Tried to replace an element in the log!");
+  std::pair<iterator, bool>
+  insert(const std::pair<const Region *, RejectLog> &New) {
+    return Logs.insert(New);
   }
 
   std::map<const Region *, RejectLog>::mapped_type at(const Region *R) {





More information about the llvm-commits mailing list