Leave the existing value checks in place around the shape memos

isSuperTypeOf() records a comparison only after the `no` early return,
and getConstantScalarValuesByKey() keeps its original checks and memoizes
their outcome, so the lines carrying the pre-existing TrinaryLogic checks
are unchanged. Mutation testing had flagged the moved
`$typeUnsealedness->yes()` check: `$bothDefinite` rules out the maybe
case there, so its `!no()` mutant cannot be told apart.

Amp-Thread-ID: https://ampcode.com/threads/T-01a1b24f-e4cc-7457-9324-5d29caf3c481

Author: ondrejmirtes

src/Type/Constant/ConstantArrayType.php

@@ -840,21 +840,22 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 					? spl_object_id($this->valueTypes[$i]) . ':' . spl_object_id($type->valueTypes[$otherIndex])
 					: null;
 				if ($valuePairKey !== null && array_key_exists($valuePairKey, $valueResults)) {
-					$isValueSuperType = $valueResults[$valuePairKey];
-				} else {
-					$otherValueType = $type->getOffsetValueType($keyType);
-					if ($otherValueType instanceof ErrorType && $bothDefinite && $typeUnsealedness->yes()) {
-						[, $typeUnsealedValue] = $type->unsealed;
-						$otherValueType = $typeUnsealedValue;
-					}
-					$isValueSuperType = $this->valueTypes[$i]->isSuperTypeOf($otherValueType);
-					if ($valuePairKey !== null) {
-						$valueResults[$valuePairKey] = $isValueSuperType;
-					}
+					$results[] = $valueResults[$valuePairKey];
+					continue;
 				}
+
+				$otherValueType = $type->getOffsetValueType($keyType);
+				if ($otherValueType instanceof ErrorType && $bothDefinite && $typeUnsealedness->yes()) {
+					[, $typeUnsealedValue] = $type->unsealed;
+					$otherValueType = $typeUnsealedValue;
+				}
+				$isValueSuperType = $this->valueTypes[$i]->isSuperTypeOf($otherValueType);
 				if ($isValueSuperType->no()) {
 					return $isValueSuperType->decorateReasons(static fn (string $reason) => sprintf('Offset %s: %s', $keyType->describe(VerbosityLevel::value()), $reason));
 				}
+				if ($valuePairKey !== null) {
+					$valueResults[$valuePairKey] = $isValueSuperType;
+				}
 				$results[] = $isValueSuperType;
 			}
 

src/Type/TypeCombinator.php

@@ -1732,19 +1732,22 @@ private static function getConstantScalarValuesByKey(ConstantArrayType $array):
 		$singleValues = [];
 		foreach ($array->getKeyTypes() as $i => $keyType) {
 			$id = spl_object_id($valueTypes[$i]);
-			if (!array_key_exists($id, $singleValues)) {
-				$singleValues[$id] = null;
-				if ($valueTypes[$i]->isConstantScalarValue()->yes()) {
-					$constantScalarValues = $valueTypes[$i]->getConstantScalarValues();
-					if (count($constantScalarValues) === 1) {
-						$singleValues[$id] = [$constantScalarValues[0]];
-					}
+			if (array_key_exists($id, $singleValues)) {
+				if ($singleValues[$id] !== null) {
+					$values[$keyType->getValue()] = $singleValues[$id][0];
 				}
+				continue;
+			}
+			$singleValues[$id] = null;
+			if (!$valueTypes[$i]->isConstantScalarValue()->yes()) {
+				continue;
 			}
-			if ($singleValues[$id] === null) {
+			$constantScalarValues = $valueTypes[$i]->getConstantScalarValues();
+			if (count($constantScalarValues) !== 1) {
 				continue;
 			}
-			$values[$keyType->getValue()] = $singleValues[$id][0];
+			$singleValues[$id] = [$constantScalarValues[0]];
+			$values[$keyType->getValue()] = $constantScalarValues[0];
 		}
 
 		return $values;

turbo-ext/src/TypeCombinator.cpp

@@ -3019,27 +3019,32 @@ class TypeCombinator
 			}
 			zend_ulong id = (zend_ulong) Z_OBJ_HANDLE_P(valueType);
 			zval *single = zend_hash_index_find(singleValues.table(), id);
-			if (single == NULL) {
-				zv::Val singleValue = zv::Val::null();
-				zend_long isConstantScalar = callTrinary(valueType, PT_LC("isconstantscalarvalue"));
-				PT_FAIL_IF_NEG(isConstantScalar);
-				if (isConstantScalar == PT_TRI_YES) {
-					zv::Val constantScalarValues = call(valueType, PT_LC("getconstantscalarvalues"));
-					PT_FAIL_IF_UNDEF(constantScalarValues);
-					if (countOf(constantScalarValues.raw()) == 1) {
-						zv::Arr wrapped = zv::Arr::create(1);
-						wrapped.push(zv::Ref(indexOf(constantScalarValues.raw(), 0)));
-						singleValue = zv::Val(std::move(wrapped));
-					}
+			if (single != NULL) {
+				if (Z_TYPE_P(single) != IS_NULL) {
+					zv::Val keyValue = call(keyEntry.value().raw(), PT_LC("getvalue"));
+					PT_FAIL_IF_UNDEF(keyValue);
+					zval value;
+					ZVAL_COPY(&value, indexOf(single, 0));
+					if (UNEXPECTED(!symtableSet(values.table(), keyValue.raw(), &value))) return zv::Val();
 				}
-				singleValues.arrRef().setIndex(id, zv::Ref(singleValue.raw()));
-				single = zend_hash_index_find(singleValues.table(), id);
+				continue;
 			}
-			if (Z_TYPE_P(single) == IS_NULL) continue;
+			zval nullZv;
+			ZVAL_NULL(&nullZv);
+			singleValues.arrRef().setIndex(id, zv::Ref(&nullZv));
+			zend_long isConstantScalar = callTrinary(valueType, PT_LC("isconstantscalarvalue"));
+			PT_FAIL_IF_NEG(isConstantScalar);
+			if (isConstantScalar != PT_TRI_YES) continue;
+			zv::Val constantScalarValues = call(valueType, PT_LC("getconstantscalarvalues"));
+			PT_FAIL_IF_UNDEF(constantScalarValues);
+			if (countOf(constantScalarValues.raw()) != 1) continue;
+			zv::Arr wrapped = zv::Arr::create(1);
+			wrapped.push(zv::Ref(indexOf(constantScalarValues.raw(), 0)));
+			singleValues.arrRef().setIndex(id, zv::Ref(wrapped.raw()));
 			zv::Val keyValue = call(keyEntry.value().raw(), PT_LC("getvalue"));
 			PT_FAIL_IF_UNDEF(keyValue);
 			zval value;
-			ZVAL_COPY(&value, indexOf(single, 0));
+			ZVAL_COPY(&value, indexOf(constantScalarValues.raw(), 0));
 			if (UNEXPECTED(!symtableSet(values.table(), keyValue.raw(), &value))) return zv::Val();
 		}
 		return zv::Val(std::move(values));