diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index fe86f0fab0..e903085b51 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -673,35 +673,211 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ {_MyRep} nanosecond
{_MyRep} nanoseconds
+ {_MyRep} microsecond
{_MyRep} microseconds
+ {_MyRep} millisecond
{_MyRep} milliseconds
+ {_MyRep} second
{_MyRep} seconds
+ {_MyRep} minute
{_MyRep} minutes
+ {_MyRep} hour
{_MyRep} hours
+
+ {_MyRep} day
+ {_MyRep} days
+
+
+
+
+ {_MyRep} week
+ {_MyRep} weeks
+
+
+
+
+ {_MyRep} month
+ {_MyRep} months
+
+
+
+
+ {_MyRep} year
+ {_MyRep} years
+
+
+
+
+ {(int)_Day}st
+ {(int)_Day}nd
+ {(int)_Day}rd
+ {(int)_Day}th
+
+
+
+
+ January
+ February
+ March
+ April
+ May
+ June
+ July
+ August
+ September
+ October
+ November
+ December
+ {_Month}
+
+
+
+
+ {_Year}
+
+
+
+
+ Sunday
+ Monday
+ Tuesday
+ Wednesday
+ Thursday
+ Friday
+ Saturday
+ {_Weekday}
+
+
+
+
+ {(int)_Index}st {_Weekday}
+ {(int)_Index}nd {_Weekday}
+ {(int)_Index}rd {_Weekday}
+ {(int)_Index}th {_Weekday}
+ {(int)_Index}, {_Weekday}
+
+ - _Weekday
+ - (int)_Index
+
+
+
+
+ Last {_Weekday}
+
+ - _Weekday
+
+
+
+
+ {_Month} {_Day}
+
+ - _Month
+ - _Day
+
+
+
+
+ Last day of {_Month}
+
+ - _Month
+
+
+
+
+ {_Weekday_index} of {_Month}
+
+ - _Month
+ - _Weekday_index
+
+
+
+
+ Last {_Weekday_last._Weekday} of {_Month}
+
+ - _Month
+ - _Weekday_last._Weekday
+
+
+
+
+ {_Year} {_Month}
+
+ - _Year
+ - _Month
+
+
+
+
+ {_Year} {_Month} {_Day}
+
+ - _Year
+ - _Month
+ - _Day
+
+
+
+
+ {_Month_day_last}, {_Year}
+
+ - _Year
+ - _Month_day_last._Month
+
+
+
+
+ {_Weekday_index} of {_Month}, {_Year}
+
+ - _Year
+ - _Month
+ - _Weekday_index
+
+
+
+
+ {_Weekday_last} of {_Month}, {_Year}
+
+ - _Year
+ - _Month
+ - _Weekday_last._Weekday
+
+
+
+
+ -{_Hours._MyRep}h {_Mins._MyRep}m {_Secs._MyRep}s {_Sub_secs._MyRep}ss
+ {_Hours._MyRep}h {_Mins._MyRep}m {_Secs._MyRep}s {_Sub_secs._MyRep}ss
+
+ - _Is_neg
+ - _Hours
+ - _Mins
+ - _Secs
+ - _Sub_secs
+
+