Eliminating unnecessary use of varargs in segment split and merge functions.

Copied from Perforce
 Change: 181842
 ServerID: perforce.ravenbrook.com

5 files changed, 26 insertions, 34 deletions

diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 93390a3b2bd..5e3984a8b0c 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -651,9 +651,9 @@ extern void SegSetGrey(Seg seg, TraceSet grey);
 extern void SegSetRankSet(Seg seg, RankSet rankSet);
 extern void SegSetRankAndSummary(Seg seg, RankSet rankSet, RefSet summary);
 extern Res SegMerge(Seg *mergedSegReturn, Seg segLo, Seg segHi,
-                    Bool withReservoirPermit, ...);
+                    Bool withReservoirPermit);
 extern Res SegSplit(Seg *segLoReturn, Seg *segHiReturn, Seg seg, Addr at,
-                    Bool withReservoirPermit, ...);
+                    Bool withReservoirPermit);
 extern Res SegDescribe(Seg seg, mps_lib_FILE *stream);
 extern void SegSetSummary(Seg seg, RefSet summary);
 extern Buffer SegBuffer(Seg seg);
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index 8dfe310ea70..e9797863bb8 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -160,10 +160,10 @@ typedef void (*SegSetBufferMethod)(Seg seg, Buffer buffer);
 typedef Res (*SegDescribeMethod)(Seg seg, mps_lib_FILE *stream);
 typedef Res (*SegMergeMethod)(Seg seg, Seg segHi,
                               Addr base, Addr mid, Addr limit,
-                              Bool withReservoirPermit, va_list args);
+                              Bool withReservoirPermit);
 typedef Res (*SegSplitMethod)(Seg seg, Seg segHi,
                               Addr base, Addr mid, Addr limit,
-                              Bool withReservoirPermit, va_list args);
+                              Bool withReservoirPermit);
 
 /* Buffer*Method -- see <design/buffer/> */
 
diff --git a/mps/code/poolams.c b/mps/code/poolams.c
index da5f917ea73..b871bd98b68 100644
--- a/mps/code/poolams.c
+++ b/mps/code/poolams.c
@@ -318,7 +318,7 @@ static void AMSSegFinish(Seg seg)
 
 static Res AMSSegMerge(Seg seg, Seg segHi,
                        Addr base, Addr mid, Addr limit,
-                       Bool withReservoirPermit, va_list args)
+                       Bool withReservoirPermit)
 {
   SegClass super;
   Count loGrains, hiGrains, allGrains;
@@ -357,7 +357,7 @@ static Res AMSSegMerge(Seg seg, Seg segHi,
   /* Merge the superclass fields via next-method call */
   super = SEG_SUPERCLASS(AMSSegClass);
   res = super->merge(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
@@ -402,7 +402,7 @@ failCreateTables:
 
 static Res AMSSegSplit(Seg seg, Seg segHi,
                        Addr base, Addr mid, Addr limit,
-                       Bool withReservoirPermit, va_list args)
+                       Bool withReservoirPermit)
 {
   SegClass super;
   Count loGrains, hiGrains, allGrains;
@@ -449,7 +449,7 @@ static Res AMSSegSplit(Seg seg, Seg segHi,
 
   /* Split the superclass fields via next-method call */
   super = SEG_SUPERCLASS(AMSSegClass);
-  res = super->split(seg, segHi, base, mid, limit, withReservoirPermit, args);
+  res = super->split(seg, segHi, base, mid, limit, withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
diff --git a/mps/code/seg.c b/mps/code/seg.c
index f6deeb5ba4f..f1cf1f8501d 100644
--- a/mps/code/seg.c
+++ b/mps/code/seg.c
@@ -502,7 +502,7 @@ Bool SegNext(Seg *segReturn, Arena arena, Addr addr)
  */
 
 Res SegMerge(Seg *mergedSegReturn, Seg segLo, Seg segHi,
-             Bool withReservoirPermit, ...)
+             Bool withReservoirPermit)
 {
   SegClass class;
   Addr base, mid, limit;
@@ -526,9 +526,8 @@ Res SegMerge(Seg *mergedSegReturn, Seg segLo, Seg segHi,
   ShieldFlush(arena);  /* see <design/seg/#split-merge.shield> */
 
   /* Invoke class-specific methods to do the merge */
-  va_start(args, withReservoirPermit);
   res = class->merge(segLo, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   va_end(args);
   if (ResOK != res)
     goto failMerge;
@@ -554,14 +553,13 @@ failMerge:
  */
 
 Res SegSplit(Seg *segLoReturn, Seg *segHiReturn, Seg seg, Addr at,
-             Bool withReservoirPermit, ...)
+             Bool withReservoirPermit)
 {
   Addr base, limit;
   SegClass class;
   Seg segNew;
   Arena arena;
   Res res;
-  va_list args;
   void *p;
 
   AVER(NULL != segLoReturn);
@@ -586,10 +584,8 @@ Res SegSplit(Seg *segLoReturn, Seg *segHiReturn, Seg seg, Addr at,
   segNew = p;
 
   /* Invoke class-specific methods to do the split */
-  va_start(args, withReservoirPermit);
   res = class->split(seg, segNew, base, at, limit,
-                     withReservoirPermit, args);
-  va_end(args);
+                     withReservoirPermit);
   if (ResOK != res)
     goto failSplit;
 
@@ -797,7 +793,7 @@ static void segNoSetBuffer(Seg seg, Buffer buffer)
 
 static Res segNoMerge(Seg seg, Seg segHi,
                       Addr base, Addr mid, Addr limit,
-                      Bool withReservoirPermit, va_list args)
+                      Bool withReservoirPermit)
 {
   AVERT(Seg, seg);
   AVERT(Seg, segHi);
@@ -806,7 +802,6 @@ static Res segNoMerge(Seg seg, Seg segHi,
   AVER(SegBase(segHi) == mid);
   AVER(SegLimit(segHi) == limit);
   AVER(BoolCheck(withReservoirPermit));
-  UNUSED(args);
   NOTREACHED;
   return ResFAIL;
 }
@@ -820,7 +815,7 @@ static Res segNoMerge(Seg seg, Seg segHi,
 
 static Res segTrivMerge(Seg seg, Seg segHi,
                         Addr base, Addr mid, Addr limit,
-                        Bool withReservoirPermit, va_list args)
+                        Bool withReservoirPermit)
 {
   Pool pool;
   Size align;
@@ -843,7 +838,6 @@ static Res segTrivMerge(Seg seg, Seg segHi,
   AVER(SegBase(segHi) == mid);
   AVER(SegLimit(segHi) == limit);
   AVER(BoolCheck(withReservoirPermit));
-  UNUSED(args);
 
   /* .similar.  */
   AVER(seg->rankSet == segHi->rankSet);
@@ -883,7 +877,7 @@ static Res segTrivMerge(Seg seg, Seg segHi,
 
 static Res segNoSplit(Seg seg, Seg segHi,
                       Addr base, Addr mid, Addr limit,
-                      Bool withReservoirPermit, va_list args)
+                      Bool withReservoirPermit)
 {
   AVERT(Seg, seg);
   AVER(segHi != NULL);  /* can't check fully, it's not initialized */
@@ -892,7 +886,6 @@ static Res segNoSplit(Seg seg, Seg segHi,
   AVER(SegBase(seg) == base);
   AVER(SegLimit(seg) == limit);
   AVER(BoolCheck(withReservoirPermit));
-  UNUSED(args);
   NOTREACHED;
   return ResFAIL;
 
@@ -903,7 +896,7 @@ static Res segNoSplit(Seg seg, Seg segHi,
 
 static Res segTrivSplit(Seg seg, Seg segHi,
                         Addr base, Addr mid, Addr limit,
-                        Bool withReservoirPermit, va_list args)
+                        Bool withReservoirPermit)
 {
   Tract tract;
   Pool pool;
@@ -924,7 +917,6 @@ static Res segTrivSplit(Seg seg, Seg segHi,
   AVER(SegBase(seg) == base);
   AVER(SegLimit(seg) == limit);
   AVER(BoolCheck(withReservoirPermit));
-  UNUSED(args);
 
   /* Segment may not be exposed, or in the shield cache */
   /* See <design/seg/#split-merge.shield> & <code/shield.c#def.depth> */
@@ -1422,7 +1414,7 @@ static void gcSegSetBuffer(Seg seg, Buffer buffer)
 
 static Res gcSegMerge(Seg seg, Seg segHi,
                       Addr base, Addr mid, Addr limit,
-                      Bool withReservoirPermit, va_list args)
+                      Bool withReservoirPermit)
 {
   SegClass super;
   GCSeg gcseg, gcsegHi;
@@ -1453,7 +1445,7 @@ static Res gcSegMerge(Seg seg, Seg segHi,
   /* Merge the superclass fields via next-method call */
   super = SEG_SUPERCLASS(GCSegClass);
   res = super->merge(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
@@ -1492,7 +1484,7 @@ failSuper:
 
 static Res gcSegSplit(Seg seg, Seg segHi,
                       Addr base, Addr mid, Addr limit,
-                      Bool withReservoirPermit, va_list args)
+                      Bool withReservoirPermit)
 {
   SegClass super;
   GCSeg gcseg, gcsegHi;
@@ -1525,7 +1517,7 @@ static Res gcSegSplit(Seg seg, Seg segHi,
   /* Split the superclass fields via next-method call */
   super = SEG_SUPERCLASS(GCSegClass);
   res = super->split(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
diff --git a/mps/code/segsmss.c b/mps/code/segsmss.c
index 90269aa2abb..5f325a30e8f 100644
--- a/mps/code/segsmss.c
+++ b/mps/code/segsmss.c
@@ -180,7 +180,7 @@ static void amstSegFinish(Seg seg)
  */
 static Res amstSegMerge(Seg seg, Seg segHi,
                         Addr base, Addr mid, Addr limit,
-                        Bool withReservoirPermit, va_list args)
+                        Bool withReservoirPermit)
 {
   SegClass super;
   AMST amst;
@@ -198,7 +198,7 @@ static Res amstSegMerge(Seg seg, Seg segHi,
   /* Merge the superclass fields via direct next-method call */
   super = SEG_SUPERCLASS(AMSTSegClass);
   res = super->merge(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
@@ -218,7 +218,7 @@ static Res amstSegMerge(Seg seg, Seg segHi,
 failDeliberate:
   /* Call the anti-method (see .fail) */
   res = super->split(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   AVER(res == ResOK);
   res = ResFAIL;
 failSuper:
@@ -232,7 +232,7 @@ failSuper:
 
 static Res amstSegSplit(Seg seg, Seg segHi,
                         Addr base, Addr mid, Addr limit,
-                        Bool withReservoirPermit, va_list args)
+                        Bool withReservoirPermit)
 {
   SegClass super;
   AMST amst;
@@ -249,7 +249,7 @@ static Res amstSegSplit(Seg seg, Seg segHi,
   /* Split the superclass fields via direct next-method call */
   super = SEG_SUPERCLASS(AMSTSegClass);
   res = super->split(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   if (res != ResOK)
     goto failSuper;
 
@@ -273,7 +273,7 @@ static Res amstSegSplit(Seg seg, Seg segHi,
 failDeliberate:
   /* Call the anti-method. (see .fail) */
   res = super->merge(seg, segHi, base, mid, limit,
-                     withReservoirPermit, args);
+                     withReservoirPermit);
   AVER(res == ResOK);
   res = ResFAIL;
 failSuper: