Index: CodeGen/CGDebugInfo.cpp
===================================================================
--- CodeGen/CGDebugInfo.cpp
+++ CodeGen/CGDebugInfo.cpp
@@ -2838,6 +2838,12 @@
       Flags |= llvm::DINode::FlagTypePassByReference;
     else
       Flags |= llvm::DINode::FlagTypePassByValue;
+
+    // When emitting codeview, record if a C++ record is trivial type.
+    if (CGM.getCodeGenOpts().EmitCodeView) {
+      if (CXXRD->isTrivial())
+        Flags |= llvm::DINode::FlagTrivial;
+    }
   }
 
   llvm::DICompositeType *RealDecl = DBuilder.createReplaceableCompositeType(