[AST] Preserve type constraint for identifier type

Type contraints need to be passed when creating
generic parameters from identifier types.

Author: angela-laar

lib/AST/NameLookup.cpp

@@ -2895,6 +2895,11 @@ createOpaqueParameterGenericParams(Evaluator &evaluator,GenericContext *genericC
                   { TypeLoc(opaque->getConstraint()) }
               };
               gp->setInherited(ctx.AllocateCopy(inherited));
+        } else {
+            InheritedEntry inherited[1] = {
+                { TypeLoc(repr) }
+            };
+            gp->setInherited(ctx.AllocateCopy(inherited));
         }
       implicitGenericParams.push_back(gp);
     }

lib/Sema/TypeCheckType.cpp

@@ -3825,7 +3825,7 @@ TypeResolver::resolveIdentifierType(IdentTypeRepr *IdType,
     auto *dc = getDeclContext();
     auto &ctx = getASTContext();
 
-    if ( ctx.LangOpts.hasFeature(Feature::ImplicitSome)){
+    if ( ctx.LangOpts.hasFeature(Feature::ImplicitSome) & !options.is(TypeResolverContext::Inherited) ){
         // Check whether any of the generic parameters in the context represents
         // this opaque type. If so, return that generic parameter.
         if (auto declDC = dc->getAsDecl()) {