# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1363971682 -3600
# Node ID fec5ebd058b7bfc0e5239a248f75a58031e30d7b
# Parent  ce7aae2d4fc78255f642283265895b2baeb0d36d
Fixed ecj fails when performing type erasure on void types.

diff -r ce7aae2d4fc7 -r fec5ebd058b7 graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/MethodSubstitutionVerifier.java
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/MethodSubstitutionVerifier.java	Fri Mar 22 16:02:43 2013 +0100
+++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/MethodSubstitutionVerifier.java	Fri Mar 22 18:01:22 2013 +0100
@@ -187,11 +187,22 @@
     }
 
     private boolean isTypeCompatible(TypeMirror originalType, TypeMirror substitutionType) {
-        TypeMirror original = env.getTypeUtils().erasure(originalType);
-        TypeMirror substitution = env.getTypeUtils().erasure(substitutionType);
+        TypeMirror original = originalType;
+        TypeMirror substitution = substitutionType;
+        if (needsErasure(original)) {
+            original = env.getTypeUtils().erasure(original);
+        }
+        if (needsErasure(substitution)) {
+            substitution = env.getTypeUtils().erasure(substitution);
+        }
         return env.getTypeUtils().isSameType(original, substitution);
     }
 
+    private static boolean needsErasure(TypeMirror typeMirror) {
+        return typeMirror.getKind() != TypeKind.NONE && typeMirror.getKind() != TypeKind.VOID && !typeMirror.getKind().isPrimitive() && typeMirror.getKind() != TypeKind.OTHER &&
+                        typeMirror.getKind() != TypeKind.NULL;
+    }
+
     private static TypeElement findEnclosingClass(Element element) {
         if (element.getKind().isClass()) {
             return (TypeElement) element;