commit 637d4f84076faecbbf87c03e943a1bdce2ebe93f
author Konstantin Shcheglov <scheglov@google.com> Sat Mar 06 20:54:59 2021 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Sat Mar 06 20:54:59 2021 +0000
tree a762b7226c0382f0c5b66966b927f53d61861460
parent e26bd4471ecc6f5fffdf8883bcf4b946d5baed1d

Fix null checks in _BundleWriterReferences.

Change-Id: I9c99f62846cbc574e1a4694c5b4bb18c578ab6e2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/189422
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

pkg/analyzer/lib/src/summary2/bundle_writer.dart

diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
index c6747d6..687b4f2 100644
--- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart
+++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -762,15 +762,18 @@
   int _indexOfReference(Reference? reference) {
     if (reference == null) return 0;
     if (reference.parent == null) return 0;
-    if (reference.index != null) return reference.index!;
+
+    var index = reference.index;
+    if (index != null) return index;
 
     var parentIndex = _indexOfReference(reference.parent);
     _referenceParents.add(parentIndex);
     _referenceNames.add(reference.name);
 
-    reference.index = references.length;
+    index = references.length;
+    reference.index = index;
     references.add(reference);
-    return reference.index!;
+    return index;
   }
 }