Mercurial > hg > graal-compiler
changeset 22573:74b3e5c0209c
suppressed -Xlint:try warnings
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -55,6 +55,7 @@ return metaAccess; } + @SuppressWarnings("try") protected InstalledCode assembleMethod(Method m, CodeGenTest test) { ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(m); try (Scope s = Debug.scope("assembleMethod", method, codeCache)) {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Thu Sep 03 00:54:14 2015 +0200 @@ -82,6 +82,7 @@ return processed.get(b.getId()); } + @SuppressWarnings("try") private TraceBuilderResult<T> build(T startBlock) { try (Scope s = Debug.scope("TraceBuilder"); Indent i = Debug.logAndIndent("start trace building: " + startBlock)) { ArrayList<List<T>> traces = buildTraces(startBlock); @@ -121,6 +122,7 @@ /** * Build a new trace starting at {@code block}. */ + @SuppressWarnings("try") private List<T> startTrace(T block, int traceNumber) { assert block.getPredecessors().stream().allMatch(this::processed) : "Predecessor unscheduled: " + block.getPredecessors().stream().filter(this::processed).findFirst().get(); ArrayList<T> trace = new ArrayList<>();
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Thu Sep 03 00:54:14 2015 +0200 @@ -83,6 +83,7 @@ } @Test + @SuppressWarnings("try") public void test() { RuntimeProvider rt = Graal.getRequiredCapability(RuntimeProvider.class); Providers providers = rt.getHostBackend().getProviders();
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/DegeneratedLoopsTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/DegeneratedLoopsTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -79,6 +79,7 @@ } + @SuppressWarnings("try") private void test(final String snippet) { try (Scope s = Debug.scope("DegeneratedLoopsTest", new DebugDumpScope(snippet))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/EliminateNestedCheckCastsTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/EliminateNestedCheckCastsTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -106,6 +106,7 @@ } } + @SuppressWarnings("try") private StructuredGraph compileSnippet(final String snippet, final int checkcasts, final int afterCanon) { final StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES); try (Scope s = Debug.scope("NestedCheckCastsTest", graph)) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatingReadTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatingReadTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -57,6 +57,7 @@ test("test1Snippet"); } + @SuppressWarnings("try") private void test(final String snippet) { try (Scope s = Debug.scope("FloatingReadTest", new DebugDumpScope(snippet))) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -64,6 +64,7 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CallingConvention.Type; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; @@ -653,6 +654,7 @@ * @param forceCompile specifies whether to ignore any previous code cached for the (method, * key) pair */ + @SuppressWarnings("try") protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, boolean forceCompile) { if (!forceCompile) { InstalledCode cached = cache.get(installedCodeOwner); @@ -818,6 +820,7 @@ return parse1(m, getCustomGraphBuilderSuite(GraphBuilderConfiguration.getFullDebugDefault(getDefaultGraphBuilderPlugins())), allowAssumptions); } + @SuppressWarnings("try") private StructuredGraph parse1(ResolvedJavaMethod javaMethod, PhaseSuite<HighTierContext> graphBuilderSuite, AllowAssumptions allowAssumptions) { assert javaMethod.getAnnotation(Test.class) == null : "shouldn't parse method with @Test annotation: " + javaMethod; try (Scope ds = Debug.scope("Parsing", javaMethod)) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ImplicitNullCheckTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ImplicitNullCheckTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -59,6 +59,7 @@ test("test1Snippet"); } + @SuppressWarnings("try") private void test(final String snippet) { try (Scope s = Debug.scope("FloatingReadTest", new DebugDumpScope(snippet))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -122,6 +122,7 @@ test("test2Snippet", "referenceSnippet2"); } + @SuppressWarnings("try") private void test(String snippet, String referenceSnippet) { final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO); final StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.NO);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -31,6 +31,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.options.*; import jdk.internal.jvmci.options.OptionValue.*; @@ -711,6 +712,7 @@ return getFinalSchedule(snippet, mode, SchedulingStrategy.LATEST_OUT_OF_LOOPS); } + @SuppressWarnings("try") private SchedulePhase getFinalSchedule(final String snippet, final TestMode mode, final SchedulingStrategy schedulingStrategy) { final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO); try (Scope d = Debug.scope("FloatingReadTest", graph)) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -24,6 +24,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -66,6 +67,7 @@ } @Test + @SuppressWarnings("try") public void test1() { final String snippet = "test1Snippet"; try (Scope s = Debug.scope("PushThroughPi", new DebugDumpScope(snippet))) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReadAfterCheckCastTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReadAfterCheckCastTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -78,6 +78,7 @@ test("test1Snippet"); } + @SuppressWarnings("try") private void test(final String snippet) { try (Scope s = Debug.scope("ReadAfterCheckCastTest", new DebugDumpScope(snippet))) { // check shape of graph, with lots of assumptions. will probably fail if graph
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,6 +27,7 @@ import java.lang.reflect.*; import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -68,6 +69,7 @@ } + @SuppressWarnings("try") private void eagerlyParseMethod(Class<C> clazz, String methodName) { RuntimeProvider rt = Graal.getRequiredCapability(RuntimeProvider.class); Providers providers = rt.getHostBackend().getProviders();
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -39,6 +39,7 @@ public class AllocatorTest extends BackendTest { + @SuppressWarnings("try") protected void testAllocation(String snippet, final int expectedRegisters, final int expectedRegRegMoves, final int expectedSpillMoves) { final StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES); try (Scope s = Debug.scope("AllocatorTest", graph, graph.method(), getCodeCache())) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -24,8 +24,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CallingConvention.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import static jdk.internal.jvmci.code.CodeUtil.*; import com.oracle.graal.compiler.*; @@ -45,6 +47,7 @@ super(arch); } + @SuppressWarnings("try") protected LIRGenerationResult getLIRGenerationResult(final StructuredGraph graph) { SchedulePhase schedule = null; try (Scope s = Debug.scope("FrontEnd")) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,6 +26,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -147,6 +148,7 @@ Assert.assertEquals(0, newInstanceCount); } + @SuppressWarnings("try") protected void prepareGraph(String snippet, boolean iterativeEscapeAnalysis) { ResolvedJavaMethod method = getResolvedJavaMethod(snippet); try (Scope s = Debug.scope(getClass(), method, getCodeCache())) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PoorMansEATest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PoorMansEATest.java Thu Sep 03 00:54:14 2015 +0200 @@ -57,6 +57,7 @@ test("test1Snippet"); } + @SuppressWarnings("try") private void test(final String snippet) { try (Scope s = Debug.scope("PoorMansEATest", new DebugDumpScope(snippet))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -23,8 +23,10 @@ package com.oracle.graal.compiler.test.inlining; import jdk.internal.jvmci.code.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -228,6 +230,7 @@ return superClass.protectedOverriddenMethod(); } + @SuppressWarnings("try") private StructuredGraph getGraph(final String snippet, final boolean eagerInfopointMode) { try (Scope s = Debug.scope("InliningTest", new DebugDumpScope(snippet))) { ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,8 +27,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CallingConvention.Type; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.api.runtime.*; @@ -73,6 +75,7 @@ /** * The simplest way to compile a method, using the default behavior for everything. */ + @SuppressWarnings("try") protected InstalledCode compileAndInstallMethod(ResolvedJavaMethod method) { /* Ensure every compilation gets a unique number, visible in IGV. */ try (Scope s = Debug.scope("compileAndInstallMethod", new DebugDumpScope(String.valueOf(compilationId.incrementAndGet()), true))) {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Thu Sep 03 00:54:14 2015 +0200 @@ -25,8 +25,10 @@ import java.util.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.graph.*; @@ -204,6 +206,7 @@ } @Override + @SuppressWarnings("try") protected void process() { if (!processed) { /* We want to process a method only once. */
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Sep 03 00:54:14 2015 +0200 @@ -31,8 +31,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CompilationResult.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import jdk.internal.jvmci.options.*; import jdk.internal.jvmci.options.OptionValue.*; @@ -156,6 +158,7 @@ * * @return the result of the compilation */ + @SuppressWarnings("try") public static <T extends CompilationResult> T compile(Request<T> r) { assert !r.graph.isFrozen(); try (Scope s0 = Debug.scope("GraalCompiler", r.graph, r.providers.getCodeCache())) { @@ -178,6 +181,7 @@ /** * Builds the graph, optimizes it. */ + @SuppressWarnings("try") public static SchedulePhase emitFrontEnd(Providers providers, TargetProvider target, StructuredGraph graph, PhaseSuite<HighTierContext> graphBuilderSuite, OptimisticOptimizations optimisticOpts, ProfilingInfo profilingInfo, Suites suites) { try (Scope s = Debug.scope("FrontEnd"); DebugCloseable a = FrontEnd.start()) { @@ -209,6 +213,7 @@ } } + @SuppressWarnings("try") public static <T extends CompilationResult> void emitBackEnd(StructuredGraph graph, Object stub, CallingConvention cc, ResolvedJavaMethod installedCodeOwner, Backend backend, T compilationResult, CompilationResultBuilderFactory factory, SchedulePhase schedule, RegisterConfig registerConfig, LIRSuites lirSuites) { try (Scope s = Debug.scope("BackEnd", schedule); DebugCloseable a = BackEnd.start()) { @@ -233,6 +238,7 @@ } } + @SuppressWarnings("try") public static LIRGenerationResult emitLIR(Backend backend, SchedulePhase schedule, StructuredGraph graph, Object stub, CallingConvention cc, RegisterConfig registerConfig, LIRSuites lirSuites) { try { return emitLIR0(backend, schedule, graph, stub, cc, registerConfig, lirSuites); @@ -248,6 +254,7 @@ } } + @SuppressWarnings("try") private static LIRGenerationResult emitLIR0(Backend backend, SchedulePhase schedule, StructuredGraph graph, Object stub, CallingConvention cc, RegisterConfig registerConfig, LIRSuites lirSuites) { try (Scope ds = Debug.scope("EmitLIR"); DebugCloseable a = EmitLIR.start()) { List<Block> blocks = schedule.getCFG().getBlocks(); @@ -311,6 +318,7 @@ return lirGenRes; } + @SuppressWarnings("try") public static void emitCode(Backend backend, Assumptions assumptions, ResolvedJavaMethod rootMethod, Set<ResolvedJavaMethod> inlinedMethods, int bytecodeSize, LIRGenerationResult lirGenRes, CompilationResult compilationResult, ResolvedJavaMethod installedCodeOwner, CompilationResultBuilderFactory factory) { try (DebugCloseable a = EmitCode.start()) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Thu Sep 03 00:54:14 2015 +0200 @@ -33,6 +33,7 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; @@ -261,6 +262,7 @@ return values.toArray(new Value[values.size()]); } + @SuppressWarnings("try") public void doBlock(Block block, StructuredGraph graph, BlockMap<List<Node>> blockMap) { try (BlockScope blockScope = gen.getBlockScope(block)) { @@ -342,6 +344,7 @@ } } + @SuppressWarnings("try") protected void matchComplexExpressions(List<Node> nodes) { if (matchRules != null) { try (Scope s = Debug.scope("MatchComplexExpressions")) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Thu Sep 03 00:54:14 2015 +0200 @@ -28,8 +28,10 @@ import java.util.Map.Entry; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.service.*; import com.oracle.graal.compiler.gen.*; @@ -70,6 +72,7 @@ * @param theClass * @return the set of {@link MatchStatement}s applicable to theClass. */ + @SuppressWarnings("try") public static synchronized Map<Class<? extends Node>, List<MatchStatement>> lookup(Class<? extends NodeLIRBuilder> theClass) { Map<Class<? extends Node>, List<MatchStatement>> result = registry.get(theClass);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/GraphChangeMonitoringPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/GraphChangeMonitoringPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,7 +27,6 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; - import com.oracle.graal.graph.Graph.NodeEvent; import com.oracle.graal.graph.Graph.NodeEventScope; import com.oracle.graal.graph.Node; @@ -61,6 +60,7 @@ } @Override + @SuppressWarnings("try") protected void run(StructuredGraph graph, C context) { /* * Phase may add nodes but not end up using them so ignore additions. Nodes going dead and
--- a/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugTimerTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugTimerTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -30,6 +30,7 @@ import org.junit.*; +@SuppressWarnings("try") public class DebugTimerTest { private static final ThreadMXBean threadMXBean = Management.getThreadMXBean();
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Thu Sep 03 00:54:14 2015 +0200 @@ -368,6 +368,7 @@ } } + @SuppressWarnings("try") private RuntimeException interceptException(final Throwable e) { final DebugConfig config = getConfig(); if (config != null) {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Thu Sep 03 00:54:14 2015 +0200 @@ -980,7 +980,7 @@ private static final DebugTimer DuplicateGraph = Debug.timer("DuplicateGraph"); - @SuppressWarnings("all") + @SuppressWarnings({"all", "try"}) public Map<Node, Node> addDuplicates(Iterable<? extends Node> newNodes, final Graph oldGraph, int estimatedNodeCount, DuplicationReplacement replacements) { try (DebugCloseable s = DuplicateGraph.start()) { return NodeClass.addGraphDuplicate(this, oldGraph, estimatedNodeCount, newNodes, replacements);
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Thu Sep 03 00:54:14 2015 +0200 @@ -65,6 +65,7 @@ private static final DebugTimer Init_AllowedUsages = Debug.timer("NodeClass.Init.AllowedUsages"); private static final DebugTimer Init_IterableIds = Debug.timer("NodeClass.Init.IterableIds"); + @SuppressWarnings("try") private static <T extends Annotation> T getAnnotationTimed(AnnotatedElement e, Class<T> annotationClass) { try (DebugCloseable s = Init_AnnotationParsing.start()) { return e.getAnnotation(annotationClass); @@ -135,6 +136,7 @@ this(clazz, superNodeClass, new FieldsScanner.DefaultCalcOffset(), null, 0); } + @SuppressWarnings("try") public NodeClass(Class<T> clazz, NodeClass<? super T> superNodeClass, FieldsScanner.CalcOffset calcOffset, int[] presetIterableIds, int presetIterableId) { super(clazz); this.superNodeClass = superNodeClass; @@ -354,6 +356,7 @@ } } + @SuppressWarnings("try") @Override protected void scanField(Field field, long offset) { Input inputAnnotation = getAnnotationTimed(field, Node.Input.class);
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -48,6 +48,7 @@ c.i.intValue(); } + @SuppressWarnings("try") private void testImplicit(Integer i) { Assume.assumeTrue(HotSpotGraalRuntime.runtime().getConfig().useCompressedOops); @@ -66,6 +67,7 @@ } } + @SuppressWarnings("try") private void testExplicit(Integer i) { Assume.assumeTrue(HotSpotGraalRuntime.runtime().getConfig().useCompressedOops);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Sep 03 00:54:14 2015 +0200 @@ -54,6 +54,7 @@ } @Override + @SuppressWarnings("try") public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, JVMCIBackend jvmci, HotSpotBackend host) { assert host == null; @@ -176,15 +177,15 @@ } else { /* * System V Application Binary Interface, AMD64 Architecture Processor Supplement - * + * * Draft Version 0.96 - * + * * http://www.uclibc.org/docs/psABI-x86_64.pdf - * + * * 3.2.1 - * + * * ... - * + * * This subsection discusses usage of each register. Registers %rbp, %rbx and %r12 * through %r15 "belong" to the calling function and the called function is required to * preserve their values. In other words, a called function must preserve these
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -204,6 +204,7 @@ Assert.assertTrue(c.isEqualTo(Boolean.TRUE)); } + @SuppressWarnings("try") private StructuredGraph compile(String test, boolean compileAOT) { try (OverrideScope s = OptionValue.override(ImmutableCode, compileAOT)) { StructuredGraph graph = parseEager(test, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ClassSubstitutionsTests.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ClassSubstitutionsTests.java Thu Sep 03 00:54:14 2015 +0200 @@ -41,6 +41,7 @@ public String[] stringArrayField; + @SuppressWarnings("try") protected StructuredGraph test(final String snippet) { try (Scope s = Debug.scope("ClassSubstitutionsTest", getMetaAccess().lookupJavaMethod(getMethod(snippet)))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ConstantPoolSubstitutionsTests.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ConstantPoolSubstitutionsTests.java Thu Sep 03 00:54:14 2015 +0200 @@ -29,14 +29,15 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.StructuredGraph.*; - import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import sun.misc.*; import sun.reflect.*; public class ConstantPoolSubstitutionsTests extends GraalCompilerTest { + @SuppressWarnings("try") protected StructuredGraph test(final String snippet) { try (Scope s = Debug.scope("ConstantPoolSubstitutionsTests", getMetaAccess().lookupJavaMethod(getMethod(snippet)))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -56,6 +56,7 @@ } @Override + @SuppressWarnings("try") protected Suites createSuites() { try (OverrideScope s = OptionValue.override(GraalOptions.ImmutableCode, true)) { return super.createSuites();
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Thu Sep 03 00:54:14 2015 +0200 @@ -122,6 +122,7 @@ new MemoryUsageBenchmark().run(); } + @SuppressWarnings("try") private void doCompilation(String methodName, String label) { HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) getResolvedJavaMethod(methodName); @@ -138,6 +139,7 @@ } } + @SuppressWarnings("try") private void allocSpyCompilation(String methodName) { if (AllocSpy.isEnabled()) { HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) getResolvedJavaMethod(methodName);
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -28,6 +28,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.hotspot.*; import jdk.internal.jvmci.meta.*; @@ -246,6 +247,7 @@ return installedCode; } + @SuppressWarnings("try") private void testHelper(final String snippetName, final int expectedBarriers) throws Exception, SecurityException { ResolvedJavaMethod snippet = getResolvedJavaMethod(snippetName); try (Scope s = Debug.scope("WriteBarrierAdditionTest", snippet)) {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,6 +27,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; import com.oracle.graal.debug.internal.*; + import jdk.internal.jvmci.hotspot.*; import jdk.internal.jvmci.meta.*; @@ -626,6 +627,7 @@ testPredicate(snippet, noCheck, removedBarrierIndices); } + @SuppressWarnings("try") private void testPredicate(final String snippet, final GraphPredicate expectedBarriers, final int... removedBarrierIndices) { try (Scope d = Debug.scope("WriteBarrierVerificationTest", new DebugDumpScope(snippet))) { final StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Sep 03 00:54:14 2015 +0200 @@ -121,6 +121,7 @@ public static final DebugTimer CodeInstallationTime = Debug.timer("CodeInstallation"); + @SuppressWarnings("try") public void runCompilation() { HotSpotVMConfig config = jvmciRuntime.getConfig(); final long threadId = Thread.currentThread().getId(); @@ -273,6 +274,7 @@ entryBCI == Compiler.INVOCATION_ENTRY_BCI ? "" : "(OSR@" + entryBCI + ") "); } + @SuppressWarnings("try") private InstalledCode installMethod(final CompilationResult compResult) { final HotSpotCodeCacheProvider codeCache = (HotSpotCodeCacheProvider) jvmciRuntime.getHostJVMCIBackend().getCodeCache(); InstalledCode installedCode = null;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Sep 03 00:54:14 2015 +0200 @@ -268,6 +268,7 @@ * @param fileList {@link File#pathSeparator} separated list of Zip/Jar files to compile * @throws IOException */ + @SuppressWarnings("try") private void compile(String fileList) throws IOException { final String[] entries = fileList.split(File.pathSeparator); long start = System.currentTimeMillis(); @@ -447,6 +448,7 @@ } } + @SuppressWarnings("try") private void compileMethod(HotSpotResolvedJavaMethod method) throws InterruptedException, ExecutionException { if (methodFilters != null && !MethodFilter.matches(methodFilters, method)) { return;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Thu Sep 03 00:54:14 2015 +0200 @@ -59,6 +59,7 @@ } @Override + @SuppressWarnings("try") public void compileMethod(ResolvedJavaMethod method, int entryBCI, long jvmciEnv, int id) { // Ensure a debug configuration for this thread is initialized if (Debug.isEnabled() && DebugScope.getConfig() == null) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Sep 03 00:54:14 2015 +0200 @@ -57,6 +57,7 @@ */ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider, HotSpotProxified { + @SuppressWarnings("try") private static class Instance { private static final HotSpotGraalRuntime instance; @@ -129,6 +130,7 @@ private final HotSpotJVMCIRuntime jvmciRuntime; + @SuppressWarnings("try") private HotSpotGraalRuntime(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalCompilerFactory compilerFactory) { this.jvmciRuntime = jvmciRuntime; @@ -176,6 +178,7 @@ /** * Do deferred initialization. */ + @SuppressWarnings("try") private void completeInitialization() { if (Log.getValue() == null && !areScopedMetricsOrTimersEnabled() && Dump.getValue() == null && Verify.getValue() == null) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Thu Sep 03 00:54:14 2015 +0200 @@ -66,6 +66,7 @@ } @Override + @SuppressWarnings("try") public void completeInitialization() { final HotSpotProviders providers = getProviders(); HotSpotVMConfig config = getRuntime().getConfig();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,6 +26,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.graph.*; @@ -48,6 +49,7 @@ } @Override + @SuppressWarnings("try") protected StructuredGraph getLoweredSnippetGraph(LoweringTool tool) { ResolvedJavaType type = StampTool.typeOrNull(getObject()); if (type != null) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,8 +27,10 @@ import java.lang.reflect.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.graphbuilderconf.*; @@ -89,6 +91,7 @@ public static final ThreadLocal<StructuredGraph> SnippetGraphUnderConstruction = assertionsEnabled() ? new ThreadLocal<>() : null; @Override + @SuppressWarnings("try") protected StructuredGraph getGraph() { Plugins defaultPlugins = providers.getGraphBuilderPlugins(); MetaAccessProvider metaAccess = providers.getMetaAccess();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Thu Sep 03 00:54:14 2015 +0200 @@ -156,6 +156,7 @@ /** * Gets the code for this stub, compiling it first if necessary. */ + @SuppressWarnings("try") public synchronized InstalledCode getCode(final Backend backend) { if (code == null) { try (Scope d = Debug.sandbox("CompilingStub", DebugScope.getConfig(), providers.getCodeCache(), debugScopeContext())) {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Thu Sep 03 00:54:14 2015 +0200 @@ -341,6 +341,7 @@ return this.beforeUnwindNode; } + @SuppressWarnings("try") protected void buildRootMethod() { FrameStateBuilder startFrameState = new FrameStateBuilder(this, method, graph); startFrameState.initializeForMethodStart(graphBuilderConfig.eagerResolving() || intrinsicContext != null, graphBuilderConfig.getPlugins().getParameterPlugins()); @@ -353,6 +354,7 @@ ComputeLoopFrequenciesClosure.compute(graph); } + @SuppressWarnings("try") protected void build(FixedWithNextNode startInstruction, FrameStateBuilder startFrameState) { if (PrintProfilingInformation.getValue() && profilingInfo != null) { TTY.println("Profiling info for " + method.format("%H.%n(%p)")); @@ -1538,6 +1540,7 @@ return res; } + @SuppressWarnings("try") private void parseAndInlineCallee(ResolvedJavaMethod targetMethod, ValueNode[] args, IntrinsicContext calleeIntrinsicContext) { try (IntrinsicScope s = calleeIntrinsicContext != null && !parsingIntrinsic() ? new IntrinsicScope(this, targetMethod.getSignature().toParameterKinds(!targetMethod.isStatic()), args) : null) { @@ -2121,6 +2124,7 @@ } } + @SuppressWarnings("try") protected void processBlock(BytecodeParser parser, BciBlock block) { // Ignore blocks that have no predecessors by the time their bytecodes are parsed int currentDimension = this.getCurrentDimension();
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -57,6 +57,7 @@ } @Test + @SuppressWarnings("try") public void run0() { try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) { runTest("test", 0, 0xDEADDEAD); @@ -64,6 +65,7 @@ } @Test + @SuppressWarnings("try") public void run1() { try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) { runTest("test", -1, 0xDEADDEAD); @@ -71,6 +73,7 @@ } @Test + @SuppressWarnings("try") public void run2() { try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) { runTest("test", 1, 0xDEADDEAD);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -115,6 +115,7 @@ } @Test + @SuppressWarnings("try") public void run0() throws Exception { try (OverrideScope os = OptionValue.override(GraalOptions.InlineEverything, true)) { runTest("test", LOADER.findClass(NAME).newInstance(), 0L);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Thu Sep 03 00:54:14 2015 +0200 @@ -89,6 +89,7 @@ } @Override + @SuppressWarnings("try") protected Suites getSuites() { try (OverrideScope scope = OptionValue.override(HighTier.Options.Inline, false)) { return super.getSuites();
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -79,6 +79,7 @@ } @Override + @SuppressWarnings("try") protected InstalledCode getCode(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, boolean forceCompile) { try (OverrideScope scope = OptionValue.override(GraalOptions.InlineEverything, true)) { return super.getCode(installedCodeOwner, graph, forceCompile);
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Thu Sep 03 00:54:14 2015 +0200 @@ -226,9 +226,7 @@ actualY = tmpValue; actualConditionFlag = actualConditionFlag.mirror(); } - try (ScratchRegister scratch = masm.getScratchRegister()) { - emitCBCond(masm, actualX, actualY, actualTrueTarget, actualConditionFlag); - } + emitCBCond(masm, actualX, actualY, actualTrueTarget, actualConditionFlag); if (needJump) { masm.jmp(actualFalseTarget); masm.nop();
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Thu Sep 03 00:54:14 2015 +0200 @@ -121,6 +121,7 @@ /** * The main method doing the elimination of redundant moves. */ + @SuppressWarnings("try") private void doOptimize(LIR lir) { try (Indent indent = Debug.logAndIndent("eliminate redundant moves")) { @@ -205,6 +206,7 @@ * * @return Returns true on success and false if the the control flow is too complex. */ + @SuppressWarnings("try") private boolean solveDataFlow(LIR lir) { try (Indent indent = Debug.logAndIndent("solve data flow")) { @@ -305,6 +307,7 @@ * Deletes all move instructions where the target location already contains the source * value. */ + @SuppressWarnings("try") private void eliminateMoves(LIR lir) { try (Indent indent = Debug.logAndIndent("eliminate moves")) { @@ -354,6 +357,7 @@ /** * Updates the state for one instruction. */ + @SuppressWarnings("try") private int updateState(final int[] state, LIRInstruction op, int initValueNum) { try (final Indent indent = Debug.logAndIndent("update state for op %s, initial value num = %d", op, initValueNum)) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/IntervalWalker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/IntervalWalker.java Thu Sep 03 00:54:14 2015 +0200 @@ -216,6 +216,7 @@ * {@link #inactiveLists} are populated and {@link Interval#state}s are up to * date. */ + @SuppressWarnings("try") protected void walkTo(int toOpId) { assert currentPosition <= toOpId : "can not walk backwards"; for (Interval currentInterval = nextInterval(toOpId); currentInterval != null; currentInterval = nextInterval(toOpId)) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Thu Sep 03 00:54:14 2015 +0200 @@ -614,6 +614,7 @@ return attributes(asRegister(operand)).isCallerSave(); } + @SuppressWarnings("try") protected <B extends AbstractBlockBase<B>> void allocate(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, SpillMoveFactory spillMoveFactory, RegisterAllocationConfig registerAllocationConfig) { @@ -680,6 +681,7 @@ return new LinearScanAssignLocationsPhase(this); } + @SuppressWarnings("try") public void printIntervals(String label) { if (Debug.isLogEnabled()) { try (Indent indent = Debug.logAndIndent("intervals %s", label)) { @@ -715,6 +717,7 @@ return true; } + @SuppressWarnings("try") private void verifyRegisters() { // Enable this logging to get output for the verification process. try (Indent indent = Debug.logAndIndent("verifying register allocation")) { @@ -723,6 +726,7 @@ } } + @SuppressWarnings("try") protected void verifyIntervals() { try (Indent indent = Debug.logAndIndent("verifying intervals")) { int len = intervalsSize; @@ -811,6 +815,7 @@ } } + @SuppressWarnings("try") void verifyNoOopsInFixedIntervals() { try (Indent indent = Debug.logAndIndent("verifying that no oops are in fixed intervals *")) { CheckConsumer checkConsumer = new CheckConsumer();
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -127,7 +127,7 @@ * is a branch, spill moves are inserted before this branch and so the wrong operand * would be returned (spill moves at block boundaries are not considered in the live * ranges of intervals). - * + * * Solution: use the first opId of the branch target block instead. */ final LIRInstruction instr = allocator.getLIR().getLIRforBlock(block).get(allocator.getLIR().getLIRforBlock(block).size() - 1); @@ -217,6 +217,7 @@ return false; } + @SuppressWarnings("try") private void assignLocations() { try (Indent indent = Debug.logAndIndent("assign locations")) { for (AbstractBlockBase<?> block : allocator.sortedBlocks()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -76,6 +76,7 @@ } // called once before assignment of register numbers + @SuppressWarnings("try") void eliminateSpillMoves() { try (Indent indent = Debug.logAndIndent("Eliminating unnecessary spill moves")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -134,6 +134,7 @@ * Computes local live sets (i.e. {@link BlockData#liveGen} and {@link BlockData#liveKill}) * separately for each block. */ + @SuppressWarnings("try") void computeLocalLiveSets() { int liveSize = allocator.liveSetSize(); @@ -261,6 +262,7 @@ * Performs a backward dataflow analysis to compute global live sets (i.e. * {@link BlockData#liveIn} and {@link BlockData#liveOut}) for each block. */ + @SuppressWarnings("try") protected void computeGlobalLiveSets() { try (Indent indent = Debug.logAndIndent("compute global live sets")) { int numBlocks = allocator.blockCount(); @@ -353,6 +355,7 @@ } } + @SuppressWarnings("try") protected void reportFailure(int numBlocks) { try (Scope s = Debug.forceLog()) { try (Indent indent = Debug.logAndIndent("report failure")) { @@ -663,6 +666,7 @@ return RegisterPriority.MustHaveRegister; } + @SuppressWarnings("try") protected void buildIntervals() { try (Indent indent = Debug.logAndIndent("build intervals")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -58,6 +58,7 @@ allocator.printIntervals("After optimize spill position"); } + @SuppressWarnings("try") private void optimizeSpillPosition() { try (Indent indent0 = Debug.logAndIndent("OptimizeSpillPositions")) { LIRInsertionBuffer[] insertionBuffers = new LIRInsertionBuffer[allocator.getLIR().linearScanOrder().size()]; @@ -73,6 +74,7 @@ } } + @SuppressWarnings("try") private void optimizeInterval(LIRInsertionBuffer[] insertionBuffers, Interval interval) { if (interval == null || !interval.isSplitParent() || interval.spillState() != SpillState.SpillInDominator) { return; @@ -118,7 +120,7 @@ /* * The spill block is the begin of the first split child (aka the value is on the * stack). - * + * * The problem is that if spill block has more than one predecessor, the values at the * end of the predecessors might differ. Therefore, we would need a spill move in all * predecessors. To avoid this we spill in the dominator.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -49,6 +49,7 @@ allocator.printIntervals("After register allocation"); } + @SuppressWarnings("try") void allocateRegisters() { try (Indent indent = Debug.logAndIndent("allocate registers")) { Interval precoloredIntervals;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -122,6 +122,7 @@ * Inserts necessary moves (spilling or reloading) at edges between blocks for intervals that * have been split. */ + @SuppressWarnings("try") protected void resolveDataFlow() { try (Indent indent = Debug.logAndIndent("resolve data flow")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Thu Sep 03 00:54:14 2015 +0200 @@ -424,6 +424,7 @@ // maxSplitPos in two parts: // 1) the left part has already a location assigned // 2) the right part is sorted into to the unhandled-list + @SuppressWarnings("try") void splitBeforeUsage(Interval interval, int minSplitPos, int maxSplitPos) { try (Indent indent = Debug.logAndIndent("splitting interval %s between %d and %d", interval, minSplitPos, maxSplitPos)) { @@ -482,7 +483,7 @@ // maxSplitPos in two parts: // 1) the left part has already a location assigned // 2) the right part is always on the stack and therefore ignored in further processing - + @SuppressWarnings("try") void splitForSpilling(Interval interval) { // calculate allowed range of splitting position int maxSplitPos = currentPosition; @@ -682,6 +683,7 @@ } } + @SuppressWarnings("try") boolean allocFreeRegister(Interval interval) { try (Indent indent = Debug.logAndIndent("trying to find free register for %s", interval)) { @@ -779,6 +781,7 @@ } // Split an Interval and spill it to memory so that cur can be placed in a register + @SuppressWarnings("try") void allocLockedRegister(Interval interval) { try (Indent indent = Debug.logAndIndent("alloc locked register: need to split and spill to get register for %s", interval)) { @@ -880,6 +883,7 @@ } } + @SuppressWarnings("try") void printRegisterState() { try (Indent indent2 = Debug.logAndIndent("state of registers:")) { for (Register reg : availableRegs) { @@ -996,6 +1000,7 @@ // allocate a physical register or memory location to an interval @Override + @SuppressWarnings("try") protected boolean activateCurrent(Interval interval) { boolean result = true;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Thu Sep 03 00:54:14 2015 +0200 @@ -286,6 +286,7 @@ } } + @SuppressWarnings("try") private void resolveMappings() { try (Indent indent = Debug.logAndIndent("resolveMapping")) { assert verifyBeforeResolve(); @@ -386,6 +387,7 @@ unblockRegisters(fromInterval); } + @SuppressWarnings("try") private void printMapping() { try (Indent indent = Debug.logAndIndent("Mapping")) { for (int i = mappingFrom.size() - 1; i >= 0; i--) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Thu Sep 03 00:54:14 2015 +0200 @@ -50,6 +50,7 @@ super(allocator, unhandledFixedFirst, unhandledAnyFirst); } + @SuppressWarnings("try") @Override protected void handleSpillSlot(Interval interval) { assert interval.location() != null : "interval not assigned " + interval; @@ -71,6 +72,7 @@ } } + @SuppressWarnings("try") @Override void walk() { try (Scope s = Debug.scope("OptimizingLinearScanWalker")) { @@ -81,6 +83,7 @@ super.walk(); } + @SuppressWarnings("try") private void optimizeBlock(AbstractBlockBase<?> block) { if (block.getPredecessorCount() == 1) { int nextBlock = allocator.getFirstLirInstructionId(block); @@ -117,6 +120,7 @@ } } + @SuppressWarnings("try") private boolean optimize(int currentPos, AbstractBlockBase<?> currentBlock, Interval currentInterval, RegisterBinding binding) { // BEGIN initialize and sanity checks assert currentBlock != null : "block must not be null"; @@ -202,6 +206,7 @@ return true; } + @SuppressWarnings("try") private void splitRegisterInterval(Interval interval, Register reg) { // collect current usage of registers initVarsForAlloc(interval);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Thu Sep 03 00:54:14 2015 +0200 @@ -78,6 +78,7 @@ } + @SuppressWarnings("try") void verify(AbstractBlockBase<?> start) { try (Scope s = Debug.scope("RegisterVerifier")) { // setup input registers (method arguments) for first block @@ -95,6 +96,7 @@ } } + @SuppressWarnings("try") private void processBlock(AbstractBlockBase<?> block) { try (Indent indent = Debug.logAndIndent("processBlock B%d", block.getId())) { // must copy state because it is modified
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Thu Sep 03 00:54:14 2015 +0200 @@ -65,6 +65,7 @@ } @Override + @SuppressWarnings("try") protected void beforeSpillMoveElimination() { /* * PHI Ins are needed for the RegisterVerifier, otherwise PHIs where the Out and In value
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -61,6 +61,7 @@ return false; } + @SuppressWarnings("try") private boolean isPhiResolutionMove(AbstractBlockBase<?> block, MoveOp move, Interval toInterval) { assert LinearScanVariant.getValue() == LSRAVariant.SSA_LSRA; if (!toInterval.isSplitParent()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Thu Sep 03 00:54:14 2015 +0200 @@ -78,6 +78,7 @@ } + @SuppressWarnings("try") void verify(AbstractBlockBase<?> start) { try (Scope s = Debug.scope("RegisterVerifier")) { // setup input registers (method arguments) for first block @@ -95,6 +96,7 @@ } } + @SuppressWarnings("try") private void processBlock(AbstractBlockBase<?> block) { try (Indent indent = Debug.logAndIndent("processBlock B%d", block.getId())) { // must copy state because it is modified
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -55,6 +55,7 @@ resolveGlobalDataFlow(resultTraces, lirGenRes, spillMoveFactory, target.arch); } + @SuppressWarnings("try") private static <B extends AbstractBlockBase<B>> void resolveGlobalDataFlow(TraceBuilderResult<B> resultTraces, LIRGenerationResult lirGenRes, SpillMoveFactory spillMoveFactory, Architecture arch) { LIR lir = lirGenRes.getLIR(); /* Resolve trace global data-flow mismatch. */
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Thu Sep 03 00:54:14 2015 +0200 @@ -285,6 +285,7 @@ return getSpillMoveFactory().createMove(toOpr, fromOpr); } + @SuppressWarnings("try") private void resolveMappings() { try (Indent indent = Debug.logAndIndent("resolveMapping")) { assert verifyBeforeResolve(); @@ -335,6 +336,7 @@ assert checkEmpty(); } + @SuppressWarnings("try") private void breakCycle(int spillCandidate) { // no move could be processed because there is a cycle in the move list // (e.g. r1 . r2, r2 . r1), so one interval must be spilled to memory @@ -355,6 +357,7 @@ } } + @SuppressWarnings("try") private void printMapping() { try (Indent indent = Debug.logAndIndent("Mapping")) { for (int i = mappingFrom.size() - 1; i >= 0; i--) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Thu Sep 03 00:54:14 2015 +0200 @@ -216,6 +216,7 @@ * {@link #inactiveLists} are populated and {@link TraceInterval#state}s are up * to date. */ + @SuppressWarnings("try") protected void walkTo(int toOpId) { assert currentPosition <= toOpId : "can not walk backwards"; for (TraceInterval currentInterval = nextInterval(toOpId); currentInterval != null; currentInterval = nextInterval(toOpId)) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScan.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScan.java Thu Sep 03 00:54:14 2015 +0200 @@ -616,6 +616,7 @@ return attributes(asRegister(operand)).isCallerSave(); } + @SuppressWarnings("try") protected <B extends AbstractBlockBase<B>> void allocate(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, SpillMoveFactory spillMoveFactory, RegisterAllocationConfig registerAllocationConfig) { @@ -682,6 +683,7 @@ return new TraceLinearScanOptimizeSpillPositionPhase(this); } + @SuppressWarnings("try") public void printIntervals(String label) { if (Debug.isDumpEnabled(TraceRegisterAllocationPhase.TRACE_DUMP_LEVEL)) { if (Debug.isLogEnabled()) { @@ -721,6 +723,7 @@ return true; } + @SuppressWarnings("try") private void verifyRegisters() { // Enable this logging to get output for the verification process. try (Indent indent = Debug.logAndIndent("verifying register allocation")) { @@ -729,6 +732,7 @@ } } + @SuppressWarnings("try") protected void verifyIntervals() { try (Indent indent = Debug.logAndIndent("verifying intervals")) { int len = intervalsSize; @@ -817,6 +821,7 @@ } } + @SuppressWarnings("try") void verifyNoOopsInFixedIntervals() { try (Indent indent = Debug.logAndIndent("verifying that no oops are in fixed intervals *")) { CheckConsumer checkConsumer = new CheckConsumer();
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAssignLocationsPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAssignLocationsPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -134,7 +134,7 @@ * is a branch, spill moves are inserted before this branch and so the wrong operand * would be returned (spill moves at block boundaries are not considered in the live * ranges of intervals). - * + * * Solution: use the first opId of the branch target block instead. */ final LIRInstruction instr = allocator.getLIR().getLIRforBlock(block).get(allocator.getLIR().getLIRforBlock(block).size() - 1); @@ -227,6 +227,7 @@ return false; } + @SuppressWarnings("try") private void assignLocations() { try (Indent indent = Debug.logAndIndent("assign locations")) { for (AbstractBlockBase<?> block : allocator.sortedBlocks()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanEliminateSpillMovePhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanEliminateSpillMovePhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -75,6 +75,7 @@ } // called once before assignment of register numbers + @SuppressWarnings("try") void eliminateSpillMoves() { try (Indent indent = Debug.logAndIndent("Eliminating unnecessary spill moves")) { @@ -185,9 +186,9 @@ /* * assert isVariable(move.getResult()) : "LinearScan inserts only moves to variables: " + * move; - * + * * Interval curInterval = allocator.intervalFor(move.getResult()); - * + * * if (!isRegister(curInterval.location()) && curInterval.alwaysInMemory()) { assert * isStackSlotValue(curInterval.location()) : "Not a stack slot: " + curInterval.location(); * return true; } return false;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -164,6 +164,7 @@ * Computes local live sets (i.e. {@link BlockData#liveGen} and {@link BlockData#liveKill}) * separately for each block. */ + @SuppressWarnings("try") void computeLocalLiveSets() { int liveSize = allocator.liveSetSize(); @@ -291,6 +292,7 @@ * Performs a backward dataflow analysis to compute global live sets (i.e. * {@link BlockData#liveIn} and {@link BlockData#liveOut}) for each block. */ + @SuppressWarnings("try") protected void computeGlobalLiveSets() { try (Indent indent = Debug.logAndIndent("compute global live sets")) { int numBlocks = allocator.blockCount(); @@ -346,7 +348,7 @@ /* * liveIn(block) is the union of liveGen(block) with (liveOut(block) & * !liveKill(block)). - * + * * Note: liveIn has to be computed only in first iteration or if liveOut * has changed! */ @@ -385,6 +387,7 @@ } } + @SuppressWarnings("try") protected void reportFailure(int numBlocks) { try (Scope s = Debug.forceLog()) { try (Indent indent = Debug.logAndIndent("report failure")) { @@ -684,6 +687,7 @@ return RegisterPriority.MustHaveRegister; } + @SuppressWarnings("try") protected void buildIntervals() { try (Indent indent = Debug.logAndIndent("build intervals")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanOptimizeSpillPositionPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanOptimizeSpillPositionPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -58,6 +58,7 @@ allocator.printIntervals("After optimize spill position"); } + @SuppressWarnings("try") private void optimizeSpillPosition() { try (Indent indent0 = Debug.logAndIndent("OptimizeSpillPositions")) { LIRInsertionBuffer[] insertionBuffers = new LIRInsertionBuffer[allocator.getLIR().linearScanOrder().size()]; @@ -73,6 +74,7 @@ } } + @SuppressWarnings("try") private void optimizeInterval(LIRInsertionBuffer[] insertionBuffers, TraceInterval interval) { if (interval == null || !interval.isSplitParent() || interval.spillState() != SpillState.SpillInDominator) { return; @@ -118,7 +120,7 @@ /* * The spill block is the begin of the first split child (aka the value is on the * stack). - * + * * The problem is that if spill block has more than one predecessor, the values at the * end of the predecessors might differ. Therefore, we would need a spill move in all * predecessors. To avoid this we spill in the dominator.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanRegisterAllocationPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanRegisterAllocationPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -49,6 +49,7 @@ allocator.printIntervals("After register allocation"); } + @SuppressWarnings("try") void allocateRegisters() { try (Indent indent = Debug.logAndIndent("allocate registers")) { TraceInterval precoloredIntervals;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanResolveDataFlowPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanResolveDataFlowPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -127,6 +127,7 @@ * Inserts necessary moves (spilling or reloading) at edges between blocks for intervals that * have been split. */ + @SuppressWarnings("try") protected void resolveDataFlow() { try (Indent indent = Debug.logAndIndent("resolve data flow")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Thu Sep 03 00:54:14 2015 +0200 @@ -425,6 +425,7 @@ // maxSplitPos in two parts: // 1) the left part has already a location assigned // 2) the right part is sorted into to the unhandled-list + @SuppressWarnings("try") void splitBeforeUsage(TraceInterval interval, int minSplitPos, int maxSplitPos) { try (Indent indent = Debug.logAndIndent("splitting interval %s between %d and %d", interval, minSplitPos, maxSplitPos)) { @@ -483,7 +484,7 @@ // maxSplitPos in two parts: // 1) the left part has already a location assigned // 2) the right part is always on the stack and therefore ignored in further processing - + @SuppressWarnings("try") void splitForSpilling(TraceInterval interval) { // calculate allowed range of splitting position int maxSplitPos = currentPosition; @@ -683,6 +684,7 @@ } } + @SuppressWarnings("try") boolean allocFreeRegister(TraceInterval interval) { try (Indent indent = Debug.logAndIndent("trying to find free register for %s", interval)) { @@ -780,6 +782,7 @@ } // Split an Interval and spill it to memory so that cur can be placed in a register + @SuppressWarnings("try") void allocLockedRegister(TraceInterval interval) { try (Indent indent = Debug.logAndIndent("alloc locked register: need to split and spill to get register for %s", interval)) { @@ -881,6 +884,7 @@ } } + @SuppressWarnings("try") void printRegisterState() { try (Indent indent2 = Debug.logAndIndent("state of registers:")) { for (Register reg : availableRegs) { @@ -997,6 +1001,7 @@ // allocate a physical register or memory location to an interval @Override + @SuppressWarnings("try") protected boolean activateCurrent(TraceInterval interval) { boolean result = true;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Thu Sep 03 00:54:14 2015 +0200 @@ -335,6 +335,7 @@ } } + @SuppressWarnings("try") private void resolveMappings() { try (Indent indent = Debug.logAndIndent("resolveMapping")) { assert verifyBeforeResolve(); @@ -443,6 +444,7 @@ unblockRegisters(fromInterval); } + @SuppressWarnings("try") private void printMapping() { try (Indent indent = Debug.logAndIndent("Mapping")) { for (int i = mappingFrom.size() - 1; i >= 0; i--) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -59,6 +59,7 @@ private static final DebugMetric tracesMetric = Debug.metric("TraceRA[traces]"); @Override + @SuppressWarnings("try") protected <B extends AbstractBlockBase<B>> void run(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, SpillMoveFactory spillMoveFactory, RegisterAllocationConfig registerAllocationConfig) { LIR lir = lirGenRes.getLIR();
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceSimpleLifetimeAnalysisPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceSimpleLifetimeAnalysisPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -161,6 +161,7 @@ } @Override + @SuppressWarnings("try") protected void buildIntervals() { try (Indent indent = Debug.logAndIndent("build intervals")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Thu Sep 03 00:54:14 2015 +0200 @@ -88,6 +88,7 @@ this.blockMap = new BlockMap<>(lir.getControlFlowGraph()); } + @SuppressWarnings("try") private void apply() { try (Indent indent = Debug.logAndIndent("ConstantLoadOptimization")) { try (Scope s = Debug.scope("BuildDefUseTree")) { @@ -165,6 +166,7 @@ /** * Collects def-use information for a {@code block}. */ + @SuppressWarnings("try") private void analyzeBlock(AbstractBlockBase<?> block) { try (Indent indent = Debug.logAndIndent("Block: %s", block)) { @@ -224,6 +226,7 @@ /** * Creates the dominator tree and searches for an solution. */ + @SuppressWarnings("try") private void createConstantTree(DefUseTree tree) { ConstantTree constTree = new ConstantTree(lir.getControlFlowGraph(), tree); constTree.set(Flags.SUBTREE, tree.getBlock());
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java Thu Sep 03 00:54:14 2015 +0200 @@ -38,6 +38,7 @@ private final ConstantTree tree; private final BitSet visited; + @SuppressWarnings("try") public static NodeCost analyze(ConstantTree tree, AbstractBlockBase<?> startBlock) { try (Scope s = Debug.scope("ConstantTreeAnalyzer")) { ConstantTreeAnalyzer analyzer = new ConstantTreeAnalyzer(tree); @@ -61,6 +62,7 @@ * * @param startBlock The start block of the dominator subtree. */ + @SuppressWarnings("try") private void analyzeBlocks(AbstractBlockBase<?> startBlock) { Deque<AbstractBlockBase<?>> worklist = new ArrayDeque<>(); worklist.offerLast(startBlock);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Thu Sep 03 00:54:14 2015 +0200 @@ -92,6 +92,7 @@ return false; } + @SuppressWarnings("try") private void processBlock(AbstractBlockBase<T> block, UniqueWorkList<T> worklist) { if (updateOutBlock(block)) { try (Indent indent = Debug.logAndIndent("handle block %s", block)) { @@ -117,6 +118,7 @@ * Process all values of an instruction bottom-up, i.e. definitions before usages. Values that * start or end at the current operation are not included. */ + @SuppressWarnings("try") private void processInstructionBottomUp(LIRInstruction op) { try (Indent indent = Debug.logAndIndent("handle op %d, %s", op.id(), op)) { // kills
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Thu Sep 03 00:54:14 2015 +0200 @@ -99,6 +99,7 @@ calls.add(cc); } + @SuppressWarnings("try") public FrameMap buildFrameMap(LIRGenerationResult res, StackSlotAllocator allocator) { try (Scope s = Debug.scope("StackSlotAllocation")) { allocator.allocateStackSlots(this, res);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -117,6 +117,7 @@ apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, context, true); } + @SuppressWarnings("try") public final <B extends AbstractBlockBase<B>> void apply(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, C context, boolean dumpLIR) { try (Scope s = Debug.scope(getName(), this)) { try (DebugCloseable a = timer.start(); DebugCloseable c = memUseTracker.start()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Thu Sep 03 00:54:14 2015 +0200 @@ -59,6 +59,7 @@ this.defined = new HashMap<>(); } + @SuppressWarnings("try") public boolean verify() { try (Scope s = Debug.scope("SSAVerifier", lir)) { for (AbstractBlockBase<?> block : lir.getControlFlowGraph().getBlocks()) { @@ -70,6 +71,7 @@ return true; } + @SuppressWarnings("try") private void doBlock(AbstractBlockBase<?> b) { if (visited.get(b.getId())) { return;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Thu Sep 03 00:54:14 2015 +0200 @@ -165,6 +165,7 @@ } } + @SuppressWarnings("try") private void accessRecursive(Value operand, AbstractBlockBase<?> defBlock, AbstractBlockBase<?> block, Deque<AbstractBlockBase<?>> worklist) { try (Indent indent = Debug.logAndIndent("get operand %s in block %s", operand, block)) { if (block.equals(defBlock)) { @@ -195,6 +196,7 @@ } } + @SuppressWarnings("try") private int addLiveValueToBlock(Value operand, AbstractBlockBase<?> block) { try (Indent indent = Debug.logAndIndent("add incoming value!")) { int index = -1;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -55,6 +55,7 @@ processed = new BitSet(lir.getControlFlowGraph().getBlocks().size()); } + @SuppressWarnings("try") private void build(LIRGeneratorTool lirGen) { Deque<AbstractBlockBase<?>> worklist = new ArrayDeque<>(lir.getControlFlowGraph().getBlocks()); while (!worklist.isEmpty()) { @@ -82,6 +83,7 @@ valueMap.finish(lirGen); } + @SuppressWarnings("try") public void processBlock(AbstractBlockBase<?> block) { assert !processed.get(block.getId()) : "Block already processed " + block; try (Indent indent = Debug.logAndIndent("Process Block %s", block)) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Thu Sep 03 00:54:14 2015 +0200 @@ -50,6 +50,7 @@ this.lir = lir; } + @SuppressWarnings("try") private boolean verify() { try (Scope s = Debug.scope("SSIVerifier", lir)) { for (AbstractBlockBase<?> block : lir.getControlFlowGraph().getBlocks()) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Thu Sep 03 00:54:14 2015 +0200 @@ -95,6 +95,7 @@ return false; } + @SuppressWarnings("try") private void processBlock(AbstractBlockBase<?> block, Deque<AbstractBlockBase<?>> worklist) { if (updateOutBlock(block)) { try (Indent indent = Debug.logAndIndent("handle block %s", block)) { @@ -122,6 +123,7 @@ } } + @SuppressWarnings("try") private void printLiveSet(String label, BitSet liveSet) { if (Debug.isLogEnabled()) { try (Indent indent = Debug.logAndIndent(label)) { @@ -170,6 +172,7 @@ * Process all values of an instruction bottom-up, i.e. definitions before usages. Values * that start or end at the current operation are not included. */ + @SuppressWarnings("try") private void processInstructionBottomUp(LIRInstruction op) { try (Indent indent = Debug.logAndIndent("handle op %d, %s", op.id(), op)) { // kills
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Thu Sep 03 00:54:14 2015 +0200 @@ -76,6 +76,7 @@ lirGenRes.buildFrameMap(this); } + @SuppressWarnings("try") public void allocateStackSlots(FrameMapBuilderTool builder, LIRGenerationResult res) { if (builder.getNumberOfStackSlots() > 0) { try (DebugCloseable t = MainTimer.start()) { @@ -93,6 +94,7 @@ private final List<? extends AbstractBlockBase<?>> sortedBlocks; private final int maxOpId; + @SuppressWarnings("try") private Allocator(LIR lir, FrameMapBuilderTool frameMapBuilder) { this.lir = lir; this.frameMapBuilder = frameMapBuilder; @@ -110,6 +112,7 @@ } } + @SuppressWarnings("try") private void allocate() { Debug.dump(lir, "After StackSlot numbering"); @@ -197,6 +200,7 @@ // step 4: allocate stack slots // ==================== + @SuppressWarnings("try") private void allocateStackSlots() { // create unhandled lists forEachInterval(unhandled::add);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Thu Sep 03 00:54:14 2015 +0200 @@ -71,6 +71,7 @@ } } + @SuppressWarnings("try") protected void updateLIR(LIRGenerationResult res, StackSlot[] mapping) { try (Scope scope = Debug.scope("StackSlotMappingLIR")) { ValueProcedure updateProc = (value, mode, flags) -> {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopsData.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopsData.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,7 +26,6 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; - import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.cfg.*; import com.oracle.graal.graph.*; @@ -39,6 +38,7 @@ private Map<LoopBeginNode, LoopEx> loopBeginToEx = Node.newIdentityMap(); private ControlFlowGraph cfg; + @SuppressWarnings("try") public LoopsData(final StructuredGraph graph) { try (Scope s = Debug.scope("ControlFlowGraph")) { cfg = ControlFlowGraph.compute(graph, true, true, true, true);
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/ReassociateInvariantPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/ReassociateInvariantPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -24,13 +24,13 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; - import com.oracle.graal.loop.*; import com.oracle.graal.nodes.*; import com.oracle.graal.phases.*; public class ReassociateInvariantPhase extends Phase { + @SuppressWarnings("try") @Override protected void run(StructuredGraph graph) { if (graph.hasLoops()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Thu Sep 03 00:54:14 2015 +0200 @@ -256,6 +256,7 @@ this.architecture = architecture; } + @SuppressWarnings("try") public final void decode(StructuredGraph graph, EncodedGraph encodedGraph) { try (Debug.Scope scope = Debug.scope("GraphDecoder", graph)) { MethodScope methodScope = new MethodScope(graph, encodedGraph, LoopExplosionKind.NONE);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Thu Sep 03 00:54:14 2015 +0200 @@ -384,6 +384,7 @@ * Verification code that checks that the decoding of an encode graph is the same as the * original graph. */ + @SuppressWarnings("try") public static boolean verifyEncoding(StructuredGraph originalGraph, EncodedGraph encodedGraph, Architecture architecture) { StructuredGraph decodedGraph = new StructuredGraph(originalGraph.method(), AllowAssumptions.YES); GraphDecoder decoder = new GraphDecoder(architecture);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -23,6 +23,7 @@ package com.oracle.graal.phases.common; import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.graph.*; @@ -161,6 +162,7 @@ processWorkSet(graph); } + @SuppressWarnings("try") private void processWorkSet(StructuredGraph graph) { NodeEventListener listener = new NodeEventListener() { @@ -243,6 +245,7 @@ } } + @SuppressWarnings("try") public boolean tryCanonicalize(final Node node, NodeClass<?> nodeClass) { if (customCanonicalizer != null) { Node canonical = customCanonicalizer.canonicalize(node);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,6 +26,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.compiler.common.type.*; @@ -58,6 +59,7 @@ public ConditionalEliminationPhase() { } + @SuppressWarnings("try") @Override protected void run(StructuredGraph inputGraph) { graph = inputGraph;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -168,6 +168,7 @@ } @Override + @SuppressWarnings("try") protected void run(StructuredGraph graph) { Map<LoopBeginNode, Set<LocationIdentity>> modifiedInLoops = null; if (graph.hasLoops()) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -46,6 +46,7 @@ } @Override + @SuppressWarnings("try") protected void run(StructuredGraph graph, C context) { HashSetNodeEventListener listener = new HashSetNodeEventListener(); try (NodeEventScope nes = graph.trackNodeEvents(listener)) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -46,6 +46,7 @@ } @Override + @SuppressWarnings("try") protected void run(StructuredGraph graph, PhaseContext context) { HashSetNodeEventListener listener = new HashSetNodeEventListener().exclude(NODE_ADDED).exclude(ZERO_USAGES); int count = 0;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Thu Sep 03 00:54:14 2015 +0200 @@ -100,6 +100,7 @@ } } + @SuppressWarnings("try") public static void logInliningDecision(final String msg, final Object... args) { try (Scope s = Debug.scope(inliningDecisionsScopeString)) { // Can't use log here since we are varargs @@ -144,6 +145,7 @@ logInliningDecision(inliningMsg, args); } + @SuppressWarnings("try") public static boolean shouldLogInliningDecision() { try (Scope s = Debug.scope(inliningDecisionsScopeString)) { return Debug.isLogEnabled();
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Thu Sep 03 00:54:14 2015 +0200 @@ -28,6 +28,7 @@ import java.util.*; import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.compiler.common.type.*; @@ -83,6 +84,7 @@ * @return true iff one or more parameters <code>newGraph</code> were specialized to account for * a constant argument, or an argument with a more specific stamp. */ + @SuppressWarnings("try") private boolean specializeGraphToArguments(final Invoke invoke, final HighTierContext context, CanonicalizerPhase canonicalizer) { try (Debug.Scope s = Debug.scope("InlineGraph", graph)) { @@ -181,6 +183,7 @@ * Provided profiling info is mature, the resulting graph is cached. The caller is responsible * for cloning before modification. </p> */ + @SuppressWarnings("try") private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTierContext context, CanonicalizerPhase canonicalizer, StructuredGraph caller) { StructuredGraph newGraph = new StructuredGraph(method, AllowAssumptions.from(caller.getAssumptions() != null)); try (Debug.Scope s = Debug.scope("InlineGraph", newGraph)) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Thu Sep 03 00:54:14 2015 +0200 @@ -28,7 +28,9 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import jdk.internal.jvmci.meta.Assumptions.*; @@ -350,6 +352,7 @@ return null; } + @SuppressWarnings("try") private void doInline(CallsiteHolderExplorable callerCallsiteHolder, MethodInvocation calleeInvocation) { StructuredGraph callerGraph = callerCallsiteHolder.graph(); InlineInfo calleeInfo = calleeInvocation.callee(); @@ -661,6 +664,7 @@ * * @return true iff inlining was actually performed */ + @SuppressWarnings("try") public boolean moveForward() { final MethodInvocation currentInvocation = currentInvocation();
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,7 +26,6 @@ import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; - import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; @@ -136,6 +135,7 @@ apply(graph, context, true); } + @SuppressWarnings("try") protected final void apply(final StructuredGraph graph, final C context, final boolean dumpGraph) { try (DebugCloseable a = timer.start(); Scope s = Debug.scope(getClass(), this); DebugCloseable c = memUseTracker.start()) { if (dumpGraph && Debug.isDumpEnabled(BEFORE_PHASE_DUMP_LEVEL)) {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -115,6 +115,7 @@ } @Override + @SuppressWarnings("try") protected void run(StructuredGraph graph) { try (NodeEventScope scope = verifyImmutableGraph(graph)) { // assert GraphOrder.assertNonCyclicGraph(graph);
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Thu Sep 03 00:54:14 2015 +0200 @@ -144,6 +144,7 @@ } @Override + @SuppressWarnings("try") public void dump(Object object, final String message) { if (object instanceof Graph && PrintIdealGraph.getValue()) { ensureInitialized();
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -25,8 +25,10 @@ import java.util.*; import jdk.internal.jvmci.code.CompilationResult.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -483,6 +485,7 @@ assertDeepEquals(value, ret.result().asJavaConstant().asBoxedPrimitive()); } + @SuppressWarnings("try") protected StructuredGraph buildGraph(final String snippet) { try (Scope s = Debug.scope("InstanceOfTest", getMetaAccess().lookupJavaMethod(getMethod(snippet)))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -25,8 +25,10 @@ import java.lang.reflect.*; import jdk.internal.jvmci.code.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.api.replacements.*; @@ -45,6 +47,7 @@ */ public abstract class MethodSubstitutionTest extends GraalCompilerTest { + @SuppressWarnings("try") protected StructuredGraph testGraph(final String snippet) { try (Scope s = Debug.scope("MethodSubstitutionTest", getResolvedJavaMethod(snippet))) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -23,6 +23,7 @@ package com.oracle.graal.replacements.test; import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import org.junit.*; @@ -116,6 +117,7 @@ } @Test + @SuppressWarnings("try") public void test() { ResolvedJavaMethod testMethod = getResolvedJavaMethod(PEGraphDecoderTest.class, "doTest", Object.class); StructuredGraph targetGraph = null;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -79,6 +79,7 @@ } @Test(expected = JVMCIError.class) + @SuppressWarnings("try") public void testVerification() { try (DebugConfigScope scope = Debug.disableIntercept()) { compile(getResolvedJavaMethod("verificationSnippet"), null);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Thu Sep 03 00:54:14 2015 +0200 @@ -27,7 +27,9 @@ import java.util.*; import jdk.internal.jvmci.code.*; + import com.oracle.graal.debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.graphbuilderconf.*; @@ -61,6 +63,7 @@ this.graphCache = new HashMap<>(); } + @SuppressWarnings("try") private EncodedGraph createGraph(ResolvedJavaMethod method, boolean isIntrinsic) { StructuredGraph graph = new StructuredGraph(method, allowAssumptions); try (Debug.Scope scope = Debug.scope("createGraph", graph)) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Sep 03 00:54:14 2015 +0200 @@ -36,8 +36,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import jdk.internal.jvmci.options.*; import jdk.internal.jvmci.options.OptionValue.*; @@ -295,6 +297,7 @@ } @Override + @SuppressWarnings("try") public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod recursiveEntry, Object[] args) { assert method.getAnnotation(Snippet.class) != null : "Snippet must be annotated with @" + Snippet.class.getSimpleName(); assert method.hasBytecodes() : "Snippet must not be abstract or native"; @@ -447,6 +450,7 @@ * @param original the original method if {@code method} is a {@linkplain MethodSubstitution * substitution} otherwise null */ + @SuppressWarnings("try") public StructuredGraph makeGraph(ResolvedJavaMethod method, Object[] args, ResolvedJavaMethod original) { try (OverrideScope s = OptionValue.override(DeoptALot, false)) { return createGraphMaker(method, original).makeGraph(args); @@ -485,6 +489,7 @@ this.substitutedMethod = substitutedMethod; } + @SuppressWarnings("try") public StructuredGraph makeGraph(Object[] args) { try (Scope s = Debug.scope("BuildSnippetGraph", method)) { assert method.hasBytecodes() : method; @@ -551,6 +556,7 @@ /** * Builds the initial graph for a snippet. */ + @SuppressWarnings("try") protected StructuredGraph buildInitialGraph(final ResolvedJavaMethod methodToParse, Object[] args) { // Replacements cannot have optimistic assumptions since they have // to be valid for the entire run of the VM.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Sep 03 00:54:14 2015 +0200 @@ -538,6 +538,7 @@ /** * Gets a template for a given key, creating it first if necessary. */ + @SuppressWarnings("try") protected SnippetTemplate template(final Arguments args) { SnippetTemplate template = UseSnippetTemplateCache && args.cacheable ? templates.get(args.cacheKey) : null; if (template == null) { @@ -576,6 +577,7 @@ /** * Creates a snippet template. */ + @SuppressWarnings("try") protected SnippetTemplate(final Providers providers, SnippetReflectionProvider snippetReflection, Arguments args) { this.snippetReflection = snippetReflection; this.info = args.info; @@ -1198,6 +1200,7 @@ * @param args the arguments to be bound to the flattened positional parameters of the snippet * @return the map of duplicated nodes (original -> duplicate) */ + @SuppressWarnings("try") public Map<Node, Node> instantiate(MetaAccessProvider metaAccess, FixedNode replacee, UsageReplacer replacer, Arguments args) { assert assertSnippetKills(replacee); try (DebugCloseable a = args.info.instantiationTimer.start(); DebugCloseable b = instantiationTimer.start()) { @@ -1346,6 +1349,7 @@ * @param replacer object that replaces the usages of {@code replacee} * @param args the arguments to be bound to the flattened positional parameters of the snippet */ + @SuppressWarnings("try") public void instantiate(MetaAccessProvider metaAccess, FloatingNode replacee, UsageReplacer replacer, LoweringTool tool, Arguments args) { assert assertSnippetKills(replacee); try (DebugCloseable a = args.info.instantiationTimer.start()) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Thu Sep 03 00:54:14 2015 +0200 @@ -24,8 +24,10 @@ import static jdk.internal.jvmci.code.BytecodeFrame.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.graal.api.replacements.*; @@ -132,6 +134,7 @@ * * @param replacementGraph a replacement (i.e., snippet or method substitution) graph */ + @SuppressWarnings("try") protected StructuredGraph lowerReplacement(final StructuredGraph replacementGraph, LoweringTool tool) { final PhaseContext c = new PhaseContext(tool.getMetaAccess(), tool.getConstantReflection(), tool.getLowerer(), tool.getReplacements(), tool.getStampProvider()); if (!graph().hasValueProxies()) {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Thu Sep 03 00:54:14 2015 +0200 @@ -148,6 +148,7 @@ return createCallTargetImpl(source, root); } + @SuppressWarnings("try") public static void installOptimizedCallTargetCallMethod() { Providers providers = getGraalProviders(); MetaAccessProvider metaAccess = providers.getMetaAccess();
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Thu Sep 03 00:54:14 2015 +0200 @@ -26,8 +26,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.common.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import com.oracle.nfi.api.*; @@ -44,6 +46,7 @@ this.code = code; } + @SuppressWarnings("try") private void traceCall(Object... args) { try (Scope s = Debug.scope("GNFI")) { if (Debug.isLogEnabled()) { @@ -52,6 +55,7 @@ } } + @SuppressWarnings("try") private void traceResult(Object result) { try (Scope s = Debug.scope("GNFI")) { if (Debug.isLogEnabled()) {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterface.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterface.java Thu Sep 03 00:54:14 2015 +0200 @@ -24,8 +24,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CallingConvention.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.hotspot.*; import jdk.internal.jvmci.meta.*; import static com.oracle.graal.truffle.hotspot.nfi.NativeCallStubGraphBuilder.*; @@ -158,6 +160,7 @@ /** * Creates and installs a stub for calling a native function. */ + @SuppressWarnings("try") private InstalledCode installNativeFunctionStub(long functionPointer, Class<?> returnType, Class<?>... argumentTypes) { StructuredGraph g = getGraph(providers, factory, functionPointer, returnType, argumentTypes); Suites suites = providers.getSuites().createSuites();
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java Thu Sep 03 00:54:14 2015 +0200 @@ -82,6 +82,7 @@ } } + @SuppressWarnings("try") protected StructuredGraph partialEval(OptimizedCallTarget compilable, Object[] arguments, AllowAssumptions allowAssumptions) { // Executed AST so that all classes are loaded and initialized. compilable.call(arguments); @@ -104,6 +105,7 @@ new DeadCodeEliminationPhase().apply(graph); } + @SuppressWarnings("try") protected StructuredGraph parseForComparison(final String methodName) { try (Scope s = Debug.scope("Truffle", new DebugDumpScope("Comparison: " + methodName))) { StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Thu Sep 03 00:54:14 2015 +0200 @@ -278,6 +278,7 @@ public abstract void compile(OptimizedCallTarget optimizedCallTarget, boolean mayBeAsynchronous); + @SuppressWarnings("try") protected void doCompile(OptimizedCallTarget optimizedCallTarget) { boolean success = true; try (Scope s = Debug.scope("Truffle", new TruffleDebugJavaMethod(optimizedCallTarget))) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Sep 03 00:54:14 2015 +0200 @@ -125,6 +125,7 @@ return new ResolvedJavaMethod[]{callSiteProxyMethod, callDirectMethod}; } + @SuppressWarnings("try") public StructuredGraph createGraph(final OptimizedCallTarget callTarget, AllowAssumptions allowAssumptions) { try (Scope c = Debug.scope("TruffleTree")) { Debug.dump(callTarget, "truffle tree"); @@ -394,7 +395,7 @@ return decodingInvocationPlugins; } - @SuppressWarnings("unused") + @SuppressWarnings({"try", "unused"}) private void fastPartialEvaluation(OptimizedCallTarget callTarget, StructuredGraph graph, PhaseContext baseContext, HighTierContext tierContext) { if (GraphPE.getValue()) { doGraphPE(callTarget, graph); @@ -437,6 +438,7 @@ } } + @SuppressWarnings("try") private static void reportPerformanceWarnings(OptimizedCallTarget target, StructuredGraph graph) { ArrayList<ValueNode> warnings = new ArrayList<>(); for (MethodCallTargetNode call : graph.getNodes(MethodCallTargetNode.TYPE)) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Thu Sep 03 00:54:14 2015 +0200 @@ -29,8 +29,10 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.code.CallingConvention.*; + import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.*; + import jdk.internal.jvmci.meta.*; import jdk.internal.jvmci.meta.Assumptions.Assumption; @@ -121,6 +123,7 @@ public static final DebugMemUseTracker CompilationMemUse = Debug.memUseTracker("TruffleCompilationMemUse"); public static final DebugMemUseTracker CodeInstallationMemUse = Debug.memUseTracker("TruffleCodeInstallationMemUse"); + @SuppressWarnings("try") public void compileMethod(final OptimizedCallTarget compilable) { StructuredGraph graph = null; @@ -147,6 +150,7 @@ } } + @SuppressWarnings("try") public CompilationResult compileMethodHelper(StructuredGraph graph, String name, PhaseSuite<HighTierContext> graphBuilderSuite, InstalledCode predefinedInstalledCode) { try (Scope s = Debug.scope("TruffleFinal")) { Debug.dump(1, graph, "After TruffleTier");
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Wed Sep 02 22:40:18 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Thu Sep 03 00:54:14 2015 +0200 @@ -28,7 +28,6 @@ import java.util.*; import com.oracle.graal.debug.*; - import com.oracle.graal.graph.Graph.NodeEventScope; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; @@ -69,6 +68,7 @@ runAnalysis(graph, context); } + @SuppressWarnings("try") public boolean runAnalysis(final StructuredGraph graph, final PhaseContextT context) { boolean changed = false; for (int iteration = 0; iteration < maxIterations; iteration++) {