diff --git a/compiler-rt/lib/ubsan/ubsan_value.h b/compiler-rt/lib/ubsan/ubsan_value.h
index d3e62853aecb..0c41afafba9f 100644
--- a/compiler-rt/lib/ubsan/ubsan_value.h
+++ b/compiler-rt/lib/ubsan/ubsan_value.h
@@ -65,9 +65,6 @@ public:
 
 /// \brief A description of a type.
 class TypeDescriptor {
-  /// The name of the type, in a format suitable for including in diagnostics.
-  const char *TypeName;
-
   /// A value from the \c Kind enumeration, specifying what flavor of type we
   /// have.
   u16 TypeKind;
@@ -76,6 +73,10 @@ class TypeDescriptor {
   /// interpret the meaning of a ValueHandle of this type.
   u16 TypeInfo;
 
+  /// The name of the type follows, in a format suitable for including in
+  /// diagnostics.
+  char TypeName[1];
+
 public:
   enum Kind {
     /// An integer type. Lowest bit is 1 for a signed value, 0 for an unsigned