diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 2721bb8dc60f8d23148b2b08a93703223f0e49d4..41881a2e5bb35ec518b68e6b32f7f239e17c8903 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -1912,8 +1912,8 @@ bool Sema::CheckCastTypes(SourceRange TyR, QualType castType, Expr *&castExpr) {
     // We can't check any more until template instantiation time.
   } else if (!castType->isScalarType() && !castType->isVectorType()) {
     // GCC struct/union extension: allow cast to self.
-    if (Context.getCanonicalType(castType) !=
-        Context.getCanonicalType(castExpr->getType()) ||
+    if (Context.getCanonicalType(castType).getUnqualifiedType() !=
+        Context.getCanonicalType(castExpr->getType().getUnqualifiedType()) ||
         (!castType->isStructureType() && !castType->isUnionType())) {
       // Reject any other conversions to non-scalar types.
       return Diag(TyR.getBegin(), diag::err_typecheck_cond_expect_scalar)
diff --git a/clang/test/Sema/struct-cast.c b/clang/test/Sema/struct-cast.c
new file mode 100644
index 0000000000000000000000000000000000000000..734be804e6e5b3b1f275bca2747f41678ca64cc1
--- /dev/null
+++ b/clang/test/Sema/struct-cast.c
@@ -0,0 +1,14 @@
+// RUN: clang -fsyntax-only %s -verify
+
+struct S {
+ int one;
+ int two;
+};
+
+struct S const foo(void);
+
+struct S tmp;
+
+void priv_sock_init() {
+  tmp = (struct S)foo();
+}