most ptr.get() conversion

diff --git a/benchmarks/benchmarks.cpp b/benchmarks/benchmarks.cpp
index b9f8d8cb6ab5412d8f87c7b82549e0a29a48d3c1..2890737f4df5e04336a4ccb0120989e6931d905a 100644 (file)
--- a/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@ -250,7 +250,7 @@ int main(){
                     u32 id = 1000;
                     ue2::hwlmLiteral lit(str, true, id);
                     b.nt = ue2::noodBuildTable(lit);
-                    assert(b.nt != nullptr);
+                    assert(b.nt.get() != nullptr);
                 },
                 [&](MicroBenchmark &b) {
                     noodExec(b.nt.get(), b.buf.data(), b.size, 0,

diff --git a/src/rose/rose_build_misc.cpp b/src/rose/rose_build_misc.cpp
index 895f42daeacc9eabec0320603508a05b688948d7..d0c630270368de4bd2c1dad3a27d18ee5748f14c 100644 (file)
--- a/src/rose/rose_build_misc.cpp
+++ b/src/rose/rose_build_misc.cpp
@@ -505,7 +505,7 @@ bool operator<(const RoseEdgeProps &a, const RoseEdgeProps &b) {
 #ifndef NDEBUG
 bool roseHasTops(const RoseBuildImpl &build, RoseVertex v) {
     const RoseGraph &g = build.g;
-    assert(left_id(g[v].left));
+    assert(g[v].left);
 
     set<u32> graph_tops;
     if (!build.isRootSuccessor(v)) {

diff --git a/src/rose/rose_build_role_aliasing.cpp b/src/rose/rose_build_role_aliasing.cpp
index 8dedf136475d5e40c93cb8418466634a9980323b..8826f23dcc7ad22f3d96ebb71ed9c943355641d6 100644 (file)
--- a/src/rose/rose_build_role_aliasing.cpp
+++ b/src/rose/rose_build_role_aliasing.cpp
@@ -915,7 +915,7 @@ bool mergeSameCastle(RoseBuildImpl &build, RoseVertex a, RoseVertex b,
         }
     }
 
-    assert(contains(rai.rev_leftfix[b_left], b));
+    assert(contains(rai.rev_leftfix[left_id(b_left)], b));
     rai.rev_leftfix[left_id(b_left)].erase(b);
     rai.rev_leftfix[left_id(a_left)].insert(b);
 

diff --git a/unit/internal/fdr.cpp b/unit/internal/fdr.cpp
index 87ab097475ef2b8f0bffdb42d179290132a76f9d..46f19be7972685c8f26a573d658345d0ff7cbe30 100644 (file)
--- a/unit/internal/fdr.cpp
+++ b/unit/internal/fdr.cpp
@@ -61,10 +61,10 @@ using namespace ue2;
 #define CHECK_WITH_TEDDY_OK_TO_FAIL(fdr, hint)                                 \
     {                                                                          \
         auto descr = getTeddyDescription(hint);                                \
-        if (descr && fdr == nullptr) {                                         \
+        if (descr && fdr.get() == nullptr) {                                         \
             return; /* cannot build Teddy for this set of literals */          \
         } else {                                                               \
-            ASSERT_TRUE(fdr != nullptr);                                       \
+            ASSERT_TRUE(fdr.get() != nullptr);                                       \
         }                                                                      \
     }
 #endif
@@ -145,7 +145,7 @@ bytecode_ptr<FDR> buildFDREngineHinted(std::vector<hwlmLiteral> &lits,
     auto proto = fdrBuildProtoHinted(HWLM_ENGINE_FDR, lits, make_small, hint,
                                      target, grey);
     if (!proto) {
-        return nullptr;
+        return ue2::bytecode_ptr<FDR>(nullptr);
     }
     return fdrBuildTable(*proto, grey);
 }
@@ -156,7 +156,7 @@ bytecode_ptr<FDR> buildFDREngine(std::vector<hwlmLiteral> &lits,
                                  const Grey &grey) {
     auto proto = fdrBuildProto(HWLM_ENGINE_FDR, lits, make_small, target, grey);
     if (!proto) {
-        return nullptr;
+        return bytecode_ptr<FDR>(nullptr);
     }
     return fdrBuildTable(*proto, grey);
 }
@@ -421,7 +421,7 @@ TEST_P(FDRp, moveByteStream) {
     size_t size = fdrSize(fdrTable0.get());
 
     auto fdrTable = make_bytecode_ptr<FDR>(size, 64);
-    EXPECT_NE(nullptr, fdrTable);
+    EXPECT_NE(nullptr, fdrTable.get());
 
     memcpy(fdrTable.get(), fdrTable0.get(), size);
 
@@ -706,7 +706,7 @@ TEST(FDR, FDRTermS) {
     lits.push_back(hwlmLiteral("ff", 0, 1));
 
     auto fdr = buildFDREngine(lits, false, get_current_target(), Grey());
-    ASSERT_TRUE(fdr != nullptr);
+    ASSERT_TRUE(fdr.get() != nullptr);
 
     // check matches
 
@@ -729,7 +729,7 @@ TEST(FDR, FDRTermB) {
     lits.push_back(hwlmLiteral("ff", 0, 1));
 
     auto fdr = buildFDREngine(lits, false, get_current_target(), Grey());
-    ASSERT_TRUE(fdr != nullptr);
+    ASSERT_TRUE(fdr.get() != nullptr);
 
     // check matches
     struct hs_scratch scratch;

diff --git a/unit/internal/fdr_flood.cpp b/unit/internal/fdr_flood.cpp
index fd8a9734856e1bd1e57f9a67f184e9fccc189867..a3b0cc963daaffcecd2a28ea1ba0d0e8ea4fcaf7 100644 (file)
--- a/unit/internal/fdr_flood.cpp
+++ b/unit/internal/fdr_flood.cpp
@@ -55,10 +55,10 @@ using namespace ue2;
 #define CHECK_WITH_TEDDY_OK_TO_FAIL(fdr, hint)                                 \
     {                                                                          \
         auto descr = getTeddyDescription(hint);                                \
-        if (descr && fdr != nullptr) {                                         \
+        if (descr && fdr.get() != nullptr) {                                         \
             return;                                                            \
         } else {                                                               \
-            ASSERT_TRUE(fdr != nullptr);                                       \
+            ASSERT_TRUE(fdr.get() != nullptr);                                       \
         }                                                                      \
     }
 #endif

diff --git a/unit/internal/limex_nfa.cpp b/unit/internal/limex_nfa.cpp
index 28433c968c0910fde2e41f0ca9b4832b1aa49dc5..80b9159b6d43e21b57010c2ae31130815900fc67 100644 (file)
--- a/unit/internal/limex_nfa.cpp
+++ b/unit/internal/limex_nfa.cpp
@@ -87,7 +87,7 @@ protected:
 
         nfa = constructNFA(*g, &rm, fixed_depth_tops, triggers, compress_state,
                            fast_nfa, type, cc);
-        ASSERT_TRUE(nfa != nullptr);
+        ASSERT_TRUE(nfa.get() != nullptr);
 
         full_state = make_bytecode_ptr<char>(nfa->scratchStateSize, 64);
         stream_state = make_bytecode_ptr<char>(nfa->streamStateSize);
@@ -134,7 +134,7 @@ INSTANTIATE_TEST_CASE_P(
     Range((int)LIMEX_NFA_32, (int)LIMEX_NFA_512));
 
 TEST_P(LimExModelTest, StateSize) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
 
     hs_platform_info plat;
     hs_error_t err = hs_populate_platform(&plat);
@@ -150,7 +150,7 @@ TEST_P(LimExModelTest, StateSize) {
 }
 
 TEST_P(LimExModelTest, QueueExec) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
     initQueue();
     nfaQueueInitState(nfa.get(), &q);
 
@@ -165,7 +165,7 @@ TEST_P(LimExModelTest, QueueExec) {
 }
 
 TEST_P(LimExModelTest, CompressExpand) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
 
     u32 real_state_size = nfa->scratchStateSize;
     /* Only look at 8 bytes for limex 64 (rather than the padding) */
@@ -197,7 +197,7 @@ TEST_P(LimExModelTest, CompressExpand) {
 }
 
 TEST_P(LimExModelTest, InitCompressedState0) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
 
     // 64-bit NFAs assume during compression that they have >= 5 bytes of
     // compressed NFA state, which isn't true for our 8-state test pattern. We
@@ -212,7 +212,7 @@ TEST_P(LimExModelTest, InitCompressedState0) {
 }
 
 TEST_P(LimExModelTest, QueueExecToMatch) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
     initQueue();
     nfaQueueInitState(nfa.get(), &q);
 
@@ -256,7 +256,7 @@ TEST_P(LimExModelTest, QueueExecToMatch) {
 }
 
 TEST_P(LimExModelTest, QueueExecRose) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
     initQueue();
 
     // For rose, there's no callback or context.
@@ -277,7 +277,7 @@ TEST_P(LimExModelTest, QueueExecRose) {
 }
 
 TEST_P(LimExModelTest, CheckFinalState) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
     initQueue();
     nfaQueueInitState(nfa.get(), &q);
 
@@ -321,7 +321,7 @@ protected:
         }
 
         nfa = constructReversedNFA(g_rev, type, cc);
-        ASSERT_TRUE(nfa != nullptr);
+        ASSERT_TRUE(nfa.get() != nullptr);
     }
 
     // NFA type (enum NFAEngineType)
@@ -338,7 +338,7 @@ INSTANTIATE_TEST_CASE_P(LimExReverse, LimExReverseTest,
                         Range((int)LIMEX_NFA_32, (int)LIMEX_NFA_512));
 
 TEST_P(LimExReverseTest, BlockExecReverse) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
 
     u64a offset = 0;
     const u8 *buf = (const u8 *)SCAN_DATA.c_str();
@@ -381,7 +381,7 @@ protected:
 
         nfa = constructNFA(*g, &rm, fixed_depth_tops, triggers, compress_state,
                            fast_nfa, type, cc);
-        ASSERT_TRUE(nfa != nullptr);
+        ASSERT_TRUE(nfa.get() != nullptr);
 
         full_state = make_bytecode_ptr<char>(nfa->scratchStateSize, 64);
         stream_state = make_bytecode_ptr<char>(nfa->streamStateSize);
@@ -427,7 +427,7 @@ INSTANTIATE_TEST_CASE_P(LimExZombie, LimExZombieTest,
                         Range((int)LIMEX_NFA_32, (int)LIMEX_NFA_512));
 
 TEST_P(LimExZombieTest, GetZombieStatus) {
-    ASSERT_TRUE(nfa != nullptr);
+    ASSERT_TRUE(nfa.get() != nullptr);
     ASSERT_TRUE(nfa->flags & NFA_ZOMBIE);
 
     initQueue();