1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index a48e2466a84..313d99cf453 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -2108,6 +2108,10 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation,
     }
   }
 
+  // See if trivial_abi has to be dropped.
+  if (Instantiation && Instantiation->hasAttr<TrivialABIAttr>())
+    checkIllFormedTrivialABIStruct(*Instantiation);
+
   // Finish checking fields.
   ActOnFields(nullptr, Instantiation->getLocation(), Instantiation, Fields,
               SourceLocation(), SourceLocation(), nullptr);