Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle assertThat(...).isNotNull() statements #304

Merged
merged 8 commits into from Apr 22, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,128 @@
/*
* Copyright (c) 2017 Uber Technologies, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package com.uber.nullaway.handlers;

import static com.uber.nullaway.Nullness.NONNULL;

import com.google.errorprone.util.ASTHelpers;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Types;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Name;
import com.uber.nullaway.dataflow.AccessPath;
import com.uber.nullaway.dataflow.AccessPathNullnessPropagation;
import org.checkerframework.dataflow.cfg.node.MethodInvocationNode;
import org.checkerframework.dataflow.cfg.node.Node;

/** This Handler deals with assertions which ensure that their arguments cannot be null. */
public class AssertionHandler extends BaseNoOpHandler {
public AssertionHandler() {
navahgar marked this conversation as resolved.
Show resolved Hide resolved
super();
}

@Override
public NullnessHint onDataflowVisitMethodInvocation(
MethodInvocationNode node,
Types types,
Context context,
AccessPathNullnessPropagation.SubNodeValues inputs,
AccessPathNullnessPropagation.Updates thenUpdates,
AccessPathNullnessPropagation.Updates elseUpdates,
AccessPathNullnessPropagation.Updates bothUpdates) {
Symbol.MethodSymbol callee = ASTHelpers.getSymbol(node.getTree());
if (callee == null) {
return NullnessHint.UNKNOWN;
}

if (!areMethodNamesInitialized()) {
initializeMethodNames(callee);
}

/**
* Look for statements of the form: assertThat(A).isNotNull()
*
* <p>A will not be NULL after this statement.
*/
navahgar marked this conversation as resolved.
Show resolved Hide resolved
if (isMethodIsNotNull(callee)) {
Node receiver = node.getTarget().getReceiver();
if (receiver instanceof MethodInvocationNode) {
MethodInvocationNode receiver_method = (MethodInvocationNode) receiver;
Symbol.MethodSymbol receiver_symbol = ASTHelpers.getSymbol(receiver_method.getTree());
if (isMethodAssertThat(receiver_symbol)) {
Node arg = receiver_method.getArgument(0);
AccessPath ap = AccessPath.getAccessPathForNodeNoMapGet(arg);
if (ap != null) {
bothUpdates.set(ap, NONNULL);
}
}
}
}
return NullnessHint.UNKNOWN;
}

private boolean isMethodIsNotNull(Symbol.MethodSymbol methodSymbol) {
return matchesMethod(methodSymbol, isNotNull, isNotNullOwner);
}

private boolean isMethodAssertThat(Symbol.MethodSymbol methodSymbol) {
return matchesMethod(methodSymbol, assertThat, assertThatOwner);
}

private boolean matchesMethod(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Symbol.MethodSymbol methodSymbol, Name toMatchMethodName, Name toMatchOwnerName) {
return methodSymbol.name.equals(toMatchMethodName)
&& methodSymbol.owner.getQualifiedName().equals(toMatchOwnerName);
}

private boolean areMethodNamesInitialized() {
return isNotNull != null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, upon reflection, this whole thing is not thread safe, since this could execute concurrent with initializeMethodNames and return true when say isNotNullOwner and the rest are still uninitialized. So the other method being synchronized is mostly pointless.

My thoughts:

  • I remain unsure whether the same BugChecker instance, and therefore this class, will be called in parallel, we could just leave both methods unprotected and the then fix it if it turns out it can. (cc: @msridhar , do you know the answer here? )
  • We could conservatively move this check to initializeMethodNames and just have that method return early if isNotNull is already set, then call initializeMethodNames unconditionally from onDataflowVisitMethodInvocation
  • We could use toString() to match the methods, measure the overhead and leave it at that if it's not high. Early optimization being the root of all evil and all that :)

What do you think?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concurrency is only an issue with static fields, which we should avoid unless they are immutable values. There should be a single BugChecker instance per javac instance and it should not be getting called from multiple threads.

Since the only static fields here are final Strings we should be fine. But the synchronized on the private method is unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification. Removed synchronized on the method.

}

private synchronized void initializeMethodNames(Symbol.MethodSymbol methodSymbol) {
navahgar marked this conversation as resolved.
Show resolved Hide resolved
isNotNull = methodSymbol.name.table.fromString(IS_NOT_NULL_METHOD);
isNotNullOwner = methodSymbol.name.table.fromString(IS_NOT_NULL_OWNER);
assertThat = methodSymbol.name.table.fromString(ASSERT_THAT_METHOD);
assertThatOwner = methodSymbol.name.table.fromString(ASSERT_THAT_OWNER);
}

/**
* Strings corresponding to the names of the methods (and their owners) used to identify
* assertions in this handler.
*/
navahgar marked this conversation as resolved.
Show resolved Hide resolved
private static final String IS_NOT_NULL_METHOD = "isNotNull";

private static final String IS_NOT_NULL_OWNER = "com.google.common.truth.Subject";
private static final String ASSERT_THAT_METHOD = "assertThat";
private static final String ASSERT_THAT_OWNER = "com.google.common.truth.Truth";

/**
* Names of the methods (and their owners) used to identify assertions in this handler. Name used
* here refers to com.sun.tools.javac.util.Name. Comparing methods using Names is faster than
* comparing using strings.
*/
private Name isNotNull;

private Name isNotNullOwner;
private Name assertThat;
private Name assertThatOwner;
navahgar marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Up @@ -46,6 +46,7 @@ public static Handler buildDefault(Config config) {
if (config.isJarInferEnabled()) {
handlerListBuilder.add(new InferredJARModelsHandler(config));
}
handlerListBuilder.add(new AssertionHandler());
navahgar marked this conversation as resolved.
Show resolved Hide resolved
handlerListBuilder.add(new LibraryModelsHandler());
handlerListBuilder.add(new RxNullabilityPropagator());
handlerListBuilder.add(new ContractHandler());
Expand Down
52 changes: 52 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/NullAwayTest.java
Expand Up @@ -967,6 +967,58 @@ public void supportObjectsIsNull() {
.doTest();
}

@Test
public void supportAssertThatIsNotNull_String() {
compilationHelper
.addSourceLines(
"Test.java",
"package com.uber;",
"import java.util.Objects;",
"import javax.annotation.Nullable;",
"class Test {",
" private void foo(@Nullable String s) {",
" com.google.common.truth.Truth.assertThat(s).isNotNull();",
" s.toString();",
" }",
"}")
.doTest();
}

@Test
public void supportAssertThatIsNotNull_Object() {
compilationHelper
.addSourceLines(
"Test.java",
"package com.uber;",
"import java.lang.Object;",
"import java.util.Objects;",
"import javax.annotation.Nullable;",
"class Test {",
" private void foo(@Nullable Object o) {",
" com.google.common.truth.Truth.assertThat(o).isNotNull();",
" o.toString();",
" }",
"}")
.doTest();
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After adding the flag, do add a positive test that returns an error on the same code with the flag turned off.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a test with flag turned off.

@Test
public void supportAssertThatIsNotNull_Array() {
compilationHelper
.addSourceLines(
"Test.java",
"package com.uber;",
"import java.util.Objects;",
"import javax.annotation.Nullable;",
"class Test {",
" private void foo(@Nullable int[] i) {",
navahgar marked this conversation as resolved.
Show resolved Hide resolved
" com.google.common.truth.Truth.assertThat(i).isNotNull();",
" i.toString();",
" }",
"}")
.doTest();
}

@Test
public void supportSwitchExpression() {
compilationHelper
Expand Down