IRGen: Replace some calls to getDeclaredType() with getDeclaredInterfaceType()

Author: slavapestov

lib/IRGen/GenBuiltin.cpp

@@ -410,7 +410,7 @@ if (Builtin.ID == BuiltinValueKind::id) { \
     auto error = args.claimNext();
     auto errorBuffer = IGF.getErrorResultSlot(
                SILType::getPrimitiveObjectType(IGF.IGM.Context.getErrorDecl()
-                                                  ->getDeclaredType()
+                                                  ->getDeclaredInterfaceType()
                                                   ->getCanonicalType()));
     IGF.Builder.CreateStore(error, errorBuffer);
 

lib/IRGen/GenReflection.cpp

@@ -780,8 +780,8 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {
     auto *PD = dyn_cast<ProtocolDecl>(NTD);
     if (CD && CD->getSuperclass()) {
       addTypeRef(CD->getSuperclass(), CD->getGenericSignature());
-    } else if (PD && PD->getDeclaredType()->getSuperclass()) {
-      addTypeRef(PD->getDeclaredType()->getSuperclass(),
+    } else if (PD && PD->getDeclaredInterfaceType()->getSuperclass()) {
+      addTypeRef(PD->getDeclaredInterfaceType()->getSuperclass(),
                  PD->getGenericSignature());
     } else {
       B.addInt32(0);

lib/IRGen/IRGenDebugInfo.cpp

@@ -948,7 +948,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
       } else {
         // Discriminated union case without argument. Fallback to Int
         // as the element type; there is no storage here.
-        Type IntTy = IGM.Context.getIntDecl()->getDeclaredType();
+        Type IntTy = IGM.Context.getIntDecl()->getDeclaredInterfaceType();
         ElemDbgTy = DebugTypeInfo(IntTy, DbgTy.getStorageType(), Size(0),
                                   Alignment(1), true, false);
       }