commit 9b6881c26d58a46e6478294d83554fb9e3a85625
author Carl Shapiro <cshapiro@google.com> Wed Jan 26 18:41:03 2011 -0800
committer Carl Shapiro <cshapiro@google.com> Wed Jan 26 19:58:05 2011 -0800
tree 5e5c5333d5b060d1384c9987cd17e30e6d50daf3
parent d6b23e5ca90e011b6ede0d3592922616df3e33ec

Fix accidental transposition of partial and concurrent values.

In the event of an allocation failure a full, concurrent collection was
initiated instead of a partial, non-concurrent collection.  This change
assigns the correct boolean values to that settings.

These values should be made enums to ensure this does not happen again.

Bug: 3379352

Change-Id: I9336e8f832cf02e4a74745cd475914a0c312ea4e

vm/alloc/Heap.c

diff --git a/vm/alloc/Heap.c b/vm/alloc/Heap.c
index c314a31..0e563c3 100644
--- a/vm/alloc/Heap.c
+++ b/vm/alloc/Heap.c
@@ -36,8 +36,8 @@
 #include <errno.h>
 
 static const GcSpec kGcForMallocSpec = {
-    false,
-    true,
+    true,  /* isPartial */
+    false,  /* isConcurrent */
     PRESERVE,
     "GC_FOR_ALLOC"
 };
@@ -45,8 +45,8 @@
 const GcSpec *GC_FOR_MALLOC = &kGcForMallocSpec;
 
 static const GcSpec kGcConcurrentSpec  = {
-    true,
-    true,
+    true,  /* isPartial */
+    true,  /* isConcurrent */
     PRESERVE,
     "GC_CONCURRENT"
 };
@@ -54,8 +54,8 @@
 const GcSpec *GC_CONCURRENT = &kGcConcurrentSpec;
 
 static const GcSpec kGcExplicitSpec = {
-    false,
-    true,
+    false,  /* isPartial */
+    true,  /* isConcurrent */
     PRESERVE,
     "GC_EXPLICIT"
 };
@@ -63,8 +63,8 @@
 const GcSpec *GC_EXPLICIT = &kGcExplicitSpec;
 
 static const GcSpec kGcBeforeOomSpec = {
-    false,
-    false,
+    false,  /* isPartial */
+    false,  /* isConcurrent */
     CLEAR,
     "GC_BEFORE_OOM"
 };