Fix ClassCastException on useless qualifier error

Change-Id: I8442a0e196cc598f6afd7db84173936abb26e87a

4 files changed, 60 insertions, 5 deletions

diff --git a/jack-tests/.classpath b/jack-tests/.classpath
index 03ac40ae..e451b2d9 100644
--- a/jack-tests/.classpath
+++ b/jack-tests/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/compiletime/test*/**|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/jarjar/test003/dontcompile/|com/android/jack/java7/boxing/|com/android/jack/java7/exceptions/|com/android/jack/java7/parser/|com/android/jack/java7/switches/|com/android/jack/java7/trywithresources/|com/android/jack/lookup/test001/liboverride/|com/android/jack/nopackage/test*/**|com/android/jack/frontend/test002/jack/PackageName/ClassInConflictingPackage.java|com/android/jack/frontend/test005/jack/|com/android/jack/frontend/test006/jack/|com/android/jack/frontend/test007/jack/|com/android/jack/frontend/test007/jackduplicate/|com/android/jack/frontend/test008/jack/NoOuterContext.java|com/android/jack/frontend/test010/jack/UnusedLocalVar.java|com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java|com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java|com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java|com/android/jack/frontend/test016/jack/WithDuplicated.java" kind="src" path="tests"/>
+	<classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/compiletime/test*/**|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/jarjar/test003/dontcompile/|com/android/jack/java7/boxing/|com/android/jack/java7/exceptions/|com/android/jack/java7/parser/|com/android/jack/java7/switches/|com/android/jack/java7/trywithresources/|com/android/jack/lookup/test001/liboverride/|com/android/jack/nopackage/test*/**|com/android/jack/frontend/test002/jack/PackageName/ClassInConflictingPackage.java|com/android/jack/frontend/test005/jack/|com/android/jack/frontend/test006/jack/|com/android/jack/frontend/test007/jack/|com/android/jack/frontend/test007/jackduplicate/|com/android/jack/frontend/test008/jack/NoOuterContext.java|com/android/jack/frontend/test010/jack/UnusedLocalVar.java|com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java|com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java|com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java|com/android/jack/frontend/test016/jack/WithDuplicated.java|com/android/jack/frontend/test017/jack/InvalidQualification.java" kind="src" path="tests"/>
 	<classpathentry kind="lib" path="libs/junit4.jar"/>
 	<classpathentry kind="lib" path="libs/antlr-runtime-lib.jar"/>
 	<classpathentry kind="lib" path="libs/dx-ref.jar"/>
diff --git a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java
index 875a4b6f..7e98dad4 100644
--- a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java
+++ b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java
@@ -333,12 +333,11 @@ public class FrontEndTests {
    */
   @Test
   @Category(ExtraTests.class)
-  public void testUnusedLocalVar002() throws Exception {
+  public void testQualifedNew001() throws Exception {
     File outDir = AbstractTestTools.createTempDir();
 
     IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
-
-      toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
+    toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .srcToLib(
           outDir,
           /* zipFiles= */ false,
@@ -362,4 +361,34 @@ public class FrontEndTests {
           AbstractTestTools.getTestRootDir("com.android.jack.frontend.test012.jack"));
   }
 
+  /**
+   * Test that Jack is neither failing nor dropping the error in this case.
+   */
+  @Test
+  @Category(ExtraTests.class)
+  public void testUnusedLocalVar004() throws Exception {
+    File outDir = AbstractTestTools.createTempDir();
+
+    IToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    ByteArrayOutputStream err = new ByteArrayOutputStream();
+    toolchain.setOutputStream(out);
+    toolchain.setErrorStream(err);
+
+    try {
+      toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
+      .srcToLib(
+          outDir,
+          /* zipFiles= */ false,
+          AbstractTestTools.getTestRootDir("com.android.jack.frontend.test017.jack"));
+      Assert.fail();
+    } catch (FrontendCompilationException e) {
+      Assert.assertEquals(0, out.size());
+      String errString = err.toString();
+      Assert.assertTrue(errString.contains("ERROR:"));
+      Assert.assertTrue(errString.contains("InvalidQualification"));
+   }
+  }
+
 }
diff --git a/jack-tests/tests/com/android/jack/frontend/test011/jack/UnusedLocalVar.java b/jack-tests/tests/com/android/jack/frontend/test011/jack/QualifedNew.java
index 6abaebf8..9fecd3d7 100644
--- a/jack-tests/tests/com/android/jack/frontend/test011/jack/UnusedLocalVar.java
+++ b/jack-tests/tests/com/android/jack/frontend/test011/jack/QualifedNew.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.frontend.test011.jack;
 
-public class UnusedLocalVar extends ClassWithInner {
+public class QualifedNew extends ClassWithInner {
 
   public Object get() {
     ClassWithInner outer = new ClassWithInner();
diff --git a/jack-tests/tests/com/android/jack/frontend/test017/jack/InvalidQualification.java b/jack-tests/tests/com/android/jack/frontend/test017/jack/InvalidQualification.java
new file mode 100644
index 00000000..1443c8a1
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/frontend/test017/jack/InvalidQualification.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.frontend.test017.jack;
+
+public class InvalidQualification {
+
+  public static InvalidQualification get() {
+    InvalidQualification unused = new InvalidQualification();
+    return unused.new InvalidQualification();
+  }
+
+}