# HG changeset patch # User Doug Simon # Date 1394670830 -3600 # Node ID a1ddf86f5d79ebb6f44318bd477be3d5a1caa303 # Parent 10e07aaeb54f73b6a9779bc2c04a2dee46a8a96a removed FindBugs annotations and dependency on FindBugs itself diff -r 10e07aaeb54f -r a1ddf86f5d79 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Mar 12 21:55:09 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Mar 13 01:33:50 2014 +0100 @@ -51,8 +51,6 @@ import com.oracle.graal.phases.*; import com.oracle.graal.phases.tiers.*; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - public class CompilationTask implements Runnable, Comparable { // Keep static finals in a group with withinEnqueue as the last one. CompilationTask can be @@ -127,7 +125,6 @@ return entryBCI; } - @SuppressFBWarnings(value = "NN_NAKED_NOTIFY") public void run() { withinEnqueue.set(Boolean.FALSE); try { diff -r 10e07aaeb54f -r a1ddf86f5d79 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Wed Mar 12 21:55:09 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Thu Mar 13 01:33:50 2014 +0100 @@ -45,8 +45,6 @@ import com.oracle.graal.options.*; import com.oracle.graal.replacements.nodes.*; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * This class contains infrastructure to maintain counters based on {@link DynamicCounterNode}s. The * infrastructure is enabled by specifying either the GenericDynamicCounters or @@ -107,7 +105,6 @@ public static long[] delta; public static final ArrayList staticCounters = new ArrayList<>(); - @SuppressFBWarnings(value = "AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION", justification = "concurrent abstraction calls are in synchronized block") public static int getIndex(DynamicCounterNode counter) { if (!enabled) { throw new GraalInternalError("counter nodes shouldn't exist when counters are not enabled: " + counter.getGroup() + ", " + counter.getName()); diff -r 10e07aaeb54f -r a1ddf86f5d79 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Wed Mar 12 21:55:09 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Thu Mar 13 01:33:50 2014 +0100 @@ -34,8 +34,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * This class implements the graph caching system for the HotSpot platform. * @@ -117,7 +115,6 @@ } @Override - @SuppressFBWarnings(value = "VO_VOLATILE_INCREMENT", justification = "counters are only used for statistics") public StructuredGraph get(ResolvedJavaMethod method) { StructuredGraph result = (StructuredGraph) method.getCompilerStorage().get(this); @@ -132,7 +129,6 @@ } @Override - @SuppressFBWarnings(value = "VO_VOLATILE_INCREMENT", justification = "counters are only used for statistics") public boolean put(StructuredGraph graph, boolean hasMatureProfilingInfo) { assert graph.method() != null; if (hasMatureProfilingInfo) { @@ -164,7 +160,6 @@ } } - @SuppressFBWarnings(value = "VO_VOLATILE_INCREMENT", justification = "counters are only used for statistics") public void removeGraphs(long[] deoptedGraphs) { for (long graphId : deoptedGraphs) { WeakReference ref = cachedGraphIds.get(graphId); diff -r 10e07aaeb54f -r a1ddf86f5d79 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Wed Mar 12 21:55:09 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Thu Mar 13 01:33:50 2014 +0100 @@ -30,8 +30,6 @@ import com.oracle.graal.graph.*; import com.oracle.graal.replacements.nodes.*; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Substitutions for {@link java.lang.String} methods. */ @@ -53,7 +51,6 @@ } @MethodSubstitution(isStatic = false) - @SuppressFBWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ", justification = "reference equality on the receiver is what we want") public static boolean equals(final String thisString, Object obj) { if (thisString == obj) { return true; diff -r 10e07aaeb54f -r a1ddf86f5d79 mx/projects --- a/mx/projects Wed Mar 12 21:55:09 2014 +0100 +++ b/mx/projects Thu Mar 13 01:33:50 2014 +0100 @@ -233,7 +233,7 @@ # graal.graph project@com.oracle.graal.graph@subDir=graal project@com.oracle.graal.graph@sourceDirs=src -project@com.oracle.graal.graph@dependencies=FINDBUGS,com.oracle.graal.debug,com.oracle.graal.api.code +project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.api.code project@com.oracle.graal.graph@javaCompliance=1.7 project@com.oracle.graal.graph@workingSets=Graal,Graph