merged

diff --cc docs/dist/doc/index.html
index d600c82b71f9b0c92f081e736ad1e00b64bb56c6,e174e3c9fc1405086127d010c00b603de2f2fdde..b06c50bc4612741cfaedbd832523a6c063045b6c
--- 1/docs/dist/doc/index.html
--- 2/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@@ -138,7 -138,7 +138,8 @@@
  <tr> <td>README's
       </td>
       <td>Changes and porting guide for AspectJ 
+         <a href="README-190.html">1.9.0</a>,
 +        <a href="README-1811.html">1.8.10</a>,
          <a href="README-1810.html">1.8.10</a>,
          <a href="README-189.html">1.8.9</a>,
          <a href="README-188.html">1.8.8</a>,

diff --cc org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 6bba2d551b5962bd42c81df818266e7a55e0be62,99f1e5e111bc57fb6c8352315a97ba6cf076f752..19d61f5be9580d02123478cfd176617abce1f107
--- 1/org.aspectj.matcher/src/org/aspectj/weaver/World.java
--- 2/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@@ -462,10 -462,10 +462,13 @@@ public abstract class World implements 
                } else if (ty.isGenericType()) {
                        // ======= generic types ======================
                        ResolvedType rt = resolveGenericTypeFor(ty, false);
+                       if (rt.isMissing()) {
+                               return rt;
+                       }
                        ReferenceType genericType = (ReferenceType) rt;
 +                      if (rt.isMissing()) {
 +                              return rt;
 +                      }
                        return genericType;
  
                } else if (ty.isGenericWildcard()) {