new variableScope

diff --git a/src/rose/rose_build_misc.cpp b/src/rose/rose_build_misc.cpp
index d3ff236d2932631e66706783928ee5dfa26f180f..de0ae706409eeae787951b6ba2eb732cc658ada7 100644 (file)
--- a/src/rose/rose_build_misc.cpp
+++ b/src/rose/rose_build_misc.cpp
@@ -1004,9 +1004,9 @@ bool hasOrphanedTops(const RoseBuildImpl &build) {
 
     for (auto v : vertices_range(g)) {
         if (g[v].left) {
-            set<u32> &tops = leftfixes[g[v].left];
             if (!build.isRootSuccessor(v)) {
                 // Tops for infixes come from the in-edges.
+                set<u32> &tops = leftfixes[g[v].left];
                 for (const auto &e : in_edges_range(v, g)) {
                     tops.insert(g[e].rose_top);
                 }

diff --git a/src/util/dump_charclass.cpp b/src/util/dump_charclass.cpp
index df308dec0819f193f21ac4b34e242dc56586f854..2243fcbd5e265672dc5dca6b8f25bf293a29504b 100644 (file)
--- a/src/util/dump_charclass.cpp
+++ b/src/util/dump_charclass.cpp
@@ -178,9 +178,9 @@ size_t describeClassInt(ostream &os, const CharReach &incr, size_t maxLength,
 
     // Render charclass as a series of ranges
     size_t c_start = cr.find_first();
-    size_t c = c_start, c_last = 0;
+    size_t c = c_start;
     while (c != CharReach::npos) {
-        c_last = c;
+        size_t c_last = c;
         c = cr.find_next(c);
         if (c != c_last + 1 || c_last == 0xff) {
             describeRange(os, c_start, c_last, out_type);

diff --git a/unit/internal/fdr_flood.cpp b/unit/internal/fdr_flood.cpp
index 81afbeaa11ee5ad49a06a7a2f73b18aee0f0ef80..77d3ff47934ce20a8e5f97cf684de9e438a1ea17 100644 (file)
--- a/unit/internal/fdr_flood.cpp
+++ b/unit/internal/fdr_flood.cpp
@@ -488,7 +488,6 @@ TEST_P(FDRFloodp, StreamingMask) {
                                         Grey());
         CHECK_WITH_TEDDY_OK_TO_FAIL(fdr, hint);
 
-        hwlm_error_t fdrStatus;
         const u32 cnt4 = dataSize - 4 + 1;
 
         for (u32 streamChunk = 1; streamChunk <= 16; streamChunk *= 2) {
@@ -496,7 +495,7 @@ TEST_P(FDRFloodp, StreamingMask) {
             const u8 *d = data.data();
             // reference past the end of fake history to allow headroom
             const u8 *fhist = fake_history.data() + fake_history_size;
-            fdrStatus = fdrExecStreaming(fdr.get(), fhist, 0, d, streamChunk, 0,
+            hwlm_error_t fdrStatus = fdrExecStreaming(fdr.get(), fhist, 0, d, streamChunk, 0,
                                          countCallback, &scratch,
                                          HWLM_ALL_GROUPS);
             ASSERT_EQ(0, fdrStatus);