From a3bb7ac902a5b25b1caf159fc8151a7b0ce8156a Mon Sep 17 00:00:00 2001
From: "Wuyue (Tony) Sun" <sunwuyue@live.com>
Date: Sun, 19 Mar 2023 23:14:31 -0400
Subject: [PATCH] Fix position of marker for dereference of nullable errors

---
 .../checkerframework/checker/nullness/NullnessVisitor.java  | 6 ++++--
 docs/manual/contributors.tex                                | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java
index d8ecfff6ee90..4189cb5b2e9f 100644
--- a/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java
+++ b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java
@@ -271,7 +271,8 @@ public Void visitMemberSelect(MemberSelectTree tree, Void p) {
                 || tree.getExpression().getKind() == Tree.Kind.PARAMETERIZED_TYPE
                 // case 8. static member access
                 || ElementUtils.isStatic(e))) {
-            checkForNullability(tree.getExpression(), DEREFERENCE_OF_NULLABLE);
+            AnnotatedTypeMirror type = atypeFactory.getAnnotatedType(tree.getExpression());
+            checkForNullability(type, tree.getExpression(), DEREFERENCE_OF_NULLABLE);
         }
 
         return super.visitMemberSelect(tree, p);
@@ -743,7 +744,8 @@ public Void visitForLoop(ForLoopTree tree, Void p) {
     public Void visitNewClass(NewClassTree tree, Void p) {
         ExpressionTree enclosingExpr = tree.getEnclosingExpression();
         if (enclosingExpr != null) {
-            checkForNullability(enclosingExpr, DEREFERENCE_OF_NULLABLE);
+            AnnotatedTypeMirror type = atypeFactory.getAnnotatedType(enclosingExpr);
+            checkForNullability(type, enclosingExpr, DEREFERENCE_OF_NULLABLE);
         }
         AnnotatedDeclaredType type = atypeFactory.getAnnotatedType(tree);
         ExpressionTree identifier = tree.getIdentifier();
diff --git a/docs/manual/contributors.tex b/docs/manual/contributors.tex
index b37085c8f734..b2553a91e49b 100644
--- a/docs/manual/contributors.tex
+++ b/docs/manual/contributors.tex
@@ -136,4 +136,5 @@
 Vlastimil Dort,
 Weitian Xing,
 Werner Dietl,
+Wuyue (Tony) Sun,
 Zhiping Cai.