EnumSet: micro optimization

Author: marc-mabe

bench/EnumSet32Bench.php

@@ -169,11 +169,16 @@ public function benchSymDiff()
         $this->fullSet->symDiff($this->emptySet);
     }
 
-    public function benchGetOrdinals()
+    public function benchGetOrdinalsFull()
     {
         $this->fullSet->getOrdinals();
     }
 
+    public function benchGetOrdinalsEmpty()
+    {
+        $this->emptySet->getOrdinals();
+    }
+
     public function benchGetValues()
     {
         $this->fullSet->getValues();

bench/EnumSet66Bench.php

@@ -197,11 +197,16 @@ public function benchSymDiff()
         $this->fullSet->symDiff($this->emptySet);
     }
 
-    public function benchGetOrdinals()
+    public function benchGetOrdinalsFull()
     {
         $this->fullSet->getOrdinals();
     }
 
+    public function benchGetOrdinalsEmpty()
+    {
+        $this->emptySet->getOrdinals();
+    }
+
     public function benchGetValues()
     {
         $this->fullSet->getValues();

src/EnumSet.php

@@ -265,15 +265,16 @@ public function count()
      */
     private function doCountBin()
     {
-        $count = 0;
-        $byteLen = strlen($this->bitset);
+        $count   = 0;
+        $bitset  = $this->bitset;
+        $byteLen = strlen($bitset);
         for ($bytePos = 0; $bytePos < $byteLen; ++$bytePos) {
-            if ($this->bitset[$bytePos] === "\0") {
+            if ($bitset[$bytePos] === "\0") {
                 // fast skip null byte
                 continue;
             }
 
-            $ord = ord($this->bitset[$bytePos]);
+            $ord = ord($bitset[$bytePos]);
             for ($bitPos = 0; $bitPos < 8; ++$bitPos) {
                 if ($ord & (1 << $bitPos)) {
                     ++$count;
@@ -468,14 +469,15 @@ public function getOrdinals()
     private function doGetOrdinalsBin()
     {
         $ordinals = [];
-        $byteLen = strlen($this->bitset);
+        $bitset   = $this->bitset;
+        $byteLen  = strlen($bitset);
         for ($bytePos = 0; $bytePos < $byteLen; ++$bytePos) {
-            if ($this->bitset[$bytePos] === "\0") {
+            if ($bitset[$bytePos] === "\0") {
                 // fast skip null byte
                 continue;
             }
 
-            $ord = ord($this->bitset[$bytePos]);
+            $ord = ord($bitset[$bytePos]);
             for ($bitPos = 0; $bitPos < 8; ++$bitPos) {
                 if ($ord & (1 << $bitPos)) {
                     $ordinals[] = $bytePos * 8 + $bitPos;
@@ -496,9 +498,11 @@ private function doGetOrdinalsBin()
      */
     private function doGetOrdinalsInt()
     {
-        $ordinals = [];
-        for ($ord = 0; $ord < $this->ordinalMax; ++$ord) {
-            if ($this->bitset & (1 << $ord)) {
+        $ordinals   = [];
+        $ordinalMax = $this->ordinalMax;
+        $bitset     = $this->bitset;
+        for ($ord = 0; $ord < $ordinalMax; ++$ord) {
+            if ($bitset & (1 << $ord)) {
                 $ordinals[] = $ord;
             }
         }