Merge pull request #1090 from MartinNowak/fixup1081

allocating a pool must be done in the if (disabled) block
dlang · Jan 9, 2015 · 1b9ab11 · 1b9ab11
2 parents 5a91141 + 28676c3
commit 1b9ab11
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/gc/gc.d b/src/gc/gc.d
@@ -2084,11 +2084,14 @@ struct Gcx
 
         if (!tryAlloc())
         {
-            // disabled => allocate a new pool instead of collecting
-            if (disabled && !newPool(1, false))
+            if (disabled)
             {
-                // disabled but out of memory => try to free some memory
-                fullcollect();
+                // disabled => allocate a new pool instead of collecting
+                if (!newPool(1, false))
+                {
+                    // disabled but out of memory => try to free some memory
+                    fullcollect();
+                }
             }
             else if (fullcollect() < npools * ((POOLSIZE / PAGESIZE) / 8))
             {
@@ -2146,12 +2149,15 @@ struct Gcx
 
         if (!tryAlloc())
         {
-            // disabled => allocate a new pool instead of collecting
-            if (disabled && !tryAllocNewPool())
+            if (disabled)
             {
-                // disabled but out of memory => try to free some memory
-                fullcollect();
-                minimize();
+                // disabled => allocate a new pool instead of collecting
+                if (!tryAllocNewPool())
+                {
+                    // disabled but out of memory => try to free some memory
+                    fullcollect();
+                    minimize();
+                }
             }
             else
             {