From 7d649303c2480ca59c9cb8fbd155e50476c35c99 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Fri, 21 Jun 2024 15:44:33 +0000
Subject: [PATCH] Avoid setting node.staticType twice in
 PostfixExpressionResolver.

Also, add an assertion to `SharedInferenceLogWriter` to prevent
accidentally setting static types more than once in the future.

Change-Id: If96a40c5490d91b67e061158b2b92af90c05d4d2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372602
Commit-Queue: Paul Berry <paulberry@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
---
 .../lib/src/type_inference/shared_inference_log.dart | 12 ++++++++++--
 .../dart/resolver/postfix_expression_resolver.dart   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/_fe_analyzer_shared/lib/src/type_inference/shared_inference_log.dart b/pkg/_fe_analyzer_shared/lib/src/type_inference/shared_inference_log.dart
index 9c01c6a7dff..215cab7c7b7 100644
--- a/pkg/_fe_analyzer_shared/lib/src/type_inference/shared_inference_log.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/type_inference/shared_inference_log.dart
@@ -675,7 +675,11 @@ abstract class SharedInferenceLogWriterImpl<Type extends SharedType,
         expectedKind: StateKind.expression);
     addEvent(
         new Event(message: 'EXPRESSION ${describe(expression)} HAS NO TYPE'));
-    (state as ExpressionState).typeRecorded = true;
+    ExpressionState state = this.state as ExpressionState;
+    if (state.typeRecorded) {
+      fail('A type (or lack thereof) was already recorded for this expression');
+    }
+    state.typeRecorded = true;
   }
 
   @override
@@ -736,7 +740,11 @@ abstract class SharedInferenceLogWriterImpl<Type extends SharedType,
         expectedKind: StateKind.expression);
     addEvent(
         new Event(message: 'STATIC TYPE OF ${describe(expression)} IS $type'));
-    (state as ExpressionState).typeRecorded = true;
+    ExpressionState state = this.state as ExpressionState;
+    if (state.typeRecorded) {
+      fail('A type (or lack thereof) was already recorded for this expression');
+    }
+    state.typeRecorded = true;
   }
 }
 
diff --git a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
index 65de7406784..508ed9a079d 100644
--- a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -179,9 +179,9 @@ class PostfixExpressionResolver {
               ?.write(node, element, operatorReturnType, null);
         }
       }
+      node.recordStaticType(receiverType, resolver: _resolver);
     }
 
-    node.recordStaticType(receiverType, resolver: _resolver);
     _resolver.nullShortingTermination(node);
   }