From 809377cd27a2c659edcbd09129ccf46e115128f2 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Tue, 16 Jan 2018 14:54:22 +0100 Subject: [PATCH] [420984] Compiler optimization: Suppress creation of unused exception variable Recompiled Xtend files Signed-off-by: Karsten Thoms --- .../org/eclipse/xtext/ide/tests/server/DocumentTest.java | 2 -- .../regionaccess/internal/SemanticRegionFinderTest.java | 6 ------ .../xtext/resource/persistence/PortableURIsTest.java | 1 - .../xtend-gen/org/eclipse/xtext/util/XtextVersion.java | 2 -- .../org/eclipse/xtext/xtext/generator/StandardLanguage.java | 1 - .../generator/XtextGeneratorResourceSetInitializer.java | 1 - .../org/eclipse/xtext/generator/FileSystemAccessQueue.java | 1 - .../eclipse/xtext/generator/URIBasedFileSystemAccess.java | 1 - .../xtext/resource/persistence/StorageAwareResource.java | 1 - .../org/eclipse/xtext/tasks/PreferenceTaskTagProvider.java | 1 - 10 files changed, 17 deletions(-) diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/DocumentTest.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/DocumentTest.java index ac6dbf8f6..dd42211f4 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/DocumentTest.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/DocumentTest.java @@ -44,7 +44,6 @@ public class DocumentTest { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IndexOutOfBoundsException) { - final IndexOutOfBoundsException e = (IndexOutOfBoundsException)_t; } else { throw Exceptions.sneakyThrow(_t); } @@ -68,7 +67,6 @@ public class DocumentTest { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IndexOutOfBoundsException) { - final IndexOutOfBoundsException e = (IndexOutOfBoundsException)_t; } else { throw Exceptions.sneakyThrow(_t); } diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.java index cc383b831..67720a7b1 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.java @@ -97,7 +97,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IllegalStateException) { - final IllegalStateException e = (IllegalStateException)_t; } else { throw Exceptions.sneakyThrow(_t); } @@ -107,7 +106,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t_1) { if (_t_1 instanceof IllegalStateException) { - final IllegalStateException e_1 = (IllegalStateException)_t_1; } else { throw Exceptions.sneakyThrow(_t_1); } @@ -235,7 +233,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IllegalStateException) { - final IllegalStateException e = (IllegalStateException)_t; } else { throw Exceptions.sneakyThrow(_t); } @@ -245,7 +242,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t_1) { if (_t_1 instanceof IllegalStateException) { - final IllegalStateException e_1 = (IllegalStateException)_t_1; } else { throw Exceptions.sneakyThrow(_t_1); } @@ -263,7 +259,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IllegalStateException) { - final IllegalStateException e = (IllegalStateException)_t; } else { throw Exceptions.sneakyThrow(_t); } @@ -273,7 +268,6 @@ public class SemanticRegionFinderTest { Assert.fail(); } catch (final Throwable _t_1) { if (_t_1 instanceof IllegalStateException) { - final IllegalStateException e_1 = (IllegalStateException)_t_1; } else { throw Exceptions.sneakyThrow(_t_1); } diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/resource/persistence/PortableURIsTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/resource/persistence/PortableURIsTest.java index 1622c9410..bdecce9be 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/resource/persistence/PortableURIsTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/resource/persistence/PortableURIsTest.java @@ -120,7 +120,6 @@ public class PortableURIsTest extends AbstractXtextTests { Assert.fail(); } catch (final Throwable _t) { if (_t instanceof IllegalStateException) { - final IllegalStateException e = (IllegalStateException)_t; } else { throw Exceptions.sneakyThrow(_t); } diff --git a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java index c3dd30fed..cd8bfc6d8 100644 --- a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java +++ b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java @@ -101,7 +101,6 @@ public class XtextVersion { return manifest.getMainAttributes().getValue("Maven-Version"); } catch (final Throwable _t) { if (_t instanceof Exception) { - final Exception e = (Exception)_t; return null; } else { throw Exceptions.sneakyThrow(_t); @@ -112,7 +111,6 @@ public class XtextVersion { is.close(); } catch (final Throwable _t_1) { if (_t_1 instanceof IOException) { - final IOException e_1 = (IOException)_t_1; } else { throw Exceptions.sneakyThrow(_t_1); } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/StandardLanguage.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/StandardLanguage.java index 40430880f..75ac2a600 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/StandardLanguage.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/StandardLanguage.java @@ -132,7 +132,6 @@ public class StandardLanguage extends XtextGeneratorLanguage { this.addReferencedResource("platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"); } catch (final Throwable _t) { if (_t instanceof ClassNotFoundException) { - final ClassNotFoundException e = (ClassNotFoundException)_t; StandardLanguage.LOG.info("Skipping registration of Xbase genmodel. Xbase is not on the classpath."); } else { throw Exceptions.sneakyThrow(_t); diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.java index d9622c636..b778269dc 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.java @@ -65,7 +65,6 @@ public class XtextGeneratorResourceSetInitializer { genModelSupport.getDeclaredMethod("createInjectorAndDoEMFRegistration").invoke(instance); } catch (final Throwable _t) { if (_t instanceof ClassNotFoundException) { - final ClassNotFoundException e = (ClassNotFoundException)_t; XtextGeneratorResourceSetInitializer.LOG.debug("org.eclipse.emf.codegen.ecore.xtext.GenModelSupport not found, GenModels will not be indexed"); } else if (_t instanceof Exception) { final Exception e_1 = (Exception)_t; diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/FileSystemAccessQueue.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/FileSystemAccessQueue.java index 3431b1720..7b086d636 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/FileSystemAccessQueue.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/FileSystemAccessQueue.java @@ -47,7 +47,6 @@ public class FileSystemAccessQueue extends AdapterImpl { return request; } catch (final Throwable _t) { if (_t instanceof InterruptedException) { - final InterruptedException e = (InterruptedException)_t; throw new OperationCanceledException(); } else { throw Exceptions.sneakyThrow(_t); diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java index 13efe4739..95e73e7f5 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java @@ -141,7 +141,6 @@ public class URIBasedFileSystemAccess extends AbstractFileSystemAccess2 { this.generateFile(traceFileName, outputConfigName, _byteArrayInputStream); } catch (final Throwable _t) { if (_t instanceof TraceNotFoundException) { - final TraceNotFoundException e = (TraceNotFoundException)_t; } else { throw Exceptions.sneakyThrow(_t); } diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java index 9bd1e9b76..865e80907 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java @@ -68,7 +68,6 @@ public class StorageAwareResource extends LazyLinkingResource { return; } catch (final Throwable _t) { if (_t instanceof IOException) { - final IOException e = (IOException)_t; this.contents.clear(); this.eAdapters.clear(); this.unload(); diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.java index a230f67cc..60d4b3d6f 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.java @@ -65,7 +65,6 @@ public class PreferenceTaskTagProvider implements ITaskTagProvider { _xtrycatchfinallyexpression = Priority.valueOf(prios.get((i).intValue())); } catch (final Throwable _t) { if (_t instanceof IllegalArgumentException) { - final IllegalArgumentException e = (IllegalArgumentException)_t; _xtrycatchfinallyexpression = Priority.NORMAL; } else { throw Exceptions.sneakyThrow(_t);