[polly] r298259 - [DeLICM] Refector out parseSetOrNull. NFC.

[Michael Kruse via llvm-commits]

Author: meinersbur
Date: Mon Mar 20 10:37:32 2017
New Revision: 298259

URL: http://llvm.org/viewvc/llvm-project?rev=298259&view=rev
Log:
[DeLICM] Refector out parseSetOrNull. NFC.

Note that the isl::union_set(isl_ctx,std::string) constructor will
auto-convert the char* to an std::string. Converting a nullptr to
std::string is undefined in C++11 (sect. 21.4.2.9).

Modified:
    polly/trunk/unittests/DeLICM/DeLICMTest.cpp

Modified: polly/trunk/unittests/DeLICM/DeLICMTest.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/unittests/DeLICM/DeLICMTest.cpp?rev=298259&r1=298258&r2=298259&view=diff
==============================================================================
--- polly/trunk/unittests/DeLICM/DeLICMTest.cpp (original)
+++ polly/trunk/unittests/DeLICM/DeLICMTest.cpp Mon Mar 20 10:37:32 2017
@@ -51,32 +51,24 @@ typedef struct {
   const char *WrittenStr;
 } Knowledge;
 
+isl::union_set parseSetOrNull(isl_ctx *Ctx, const char *Str) {
+  if (!Str)
+    return nullptr;
+  return isl::union_set(Ctx, Str);
+}
+
 bool checkIsConflictingNonsymmetric(Knowledge Existing, Knowledge Proposed) {
   std::unique_ptr<isl_ctx, decltype(&isl_ctx_free)> Ctx(isl_ctx_alloc(),
                                                         &isl_ctx_free);
 
   // Parse knowledge.
-  auto ExistingOccupied =
-      Existing.OccupiedStr
-          ? give(isl_union_set_read_from_str(Ctx.get(), Existing.OccupiedStr))
-          : nullptr;
-  auto ExistingUnused =
-      Existing.UndefStr
-          ? give(isl_union_set_read_from_str(Ctx.get(), Existing.UndefStr))
-          : nullptr;
-  auto ExistingWritten =
-      give(isl_union_set_read_from_str(Ctx.get(), Existing.WrittenStr));
+  auto ExistingOccupied = parseSetOrNull(Ctx.get(), Existing.OccupiedStr);
+  auto ExistingUnused = parseSetOrNull(Ctx.get(), Existing.UndefStr);
+  auto ExistingWritten = parseSetOrNull(Ctx.get(), Existing.WrittenStr);
 
-  auto ProposedOccupied =
-      Proposed.OccupiedStr
-          ? give(isl_union_set_read_from_str(Ctx.get(), Proposed.OccupiedStr))
-          : nullptr;
-  auto ProposedUnused =
-      Proposed.UndefStr
-          ? give(isl_union_set_read_from_str(Ctx.get(), Proposed.UndefStr))
-          : nullptr;
-  auto ProposedWritten =
-      give(isl_union_set_read_from_str(Ctx.get(), Proposed.WrittenStr));
+  auto ProposedOccupied = parseSetOrNull(Ctx.get(), Proposed.OccupiedStr);
+  auto ProposedUnused = parseSetOrNull(Ctx.get(), Proposed.UndefStr);
+  auto ProposedWritten = parseSetOrNull(Ctx.get(), Proposed.WrittenStr);
 
   // Determine universe (set of all possible domains).
   auto Universe =