diff --git a/utils/LLVMVisualizers/llvm.natvis b/utils/LLVMVisualizers/llvm.natvis
index 9b004832d48..6d37fa01453 100644
--- a/utils/LLVMVisualizers/llvm.natvis
+++ b/utils/LLVMVisualizers/llvm.natvis
@@ -21,7 +21,17 @@ For later versions of Visual Studio, no setup is required.
       </ArrayItems>
     </Expand>
   </Type>
-
+  <Type Name="llvm::ArrayRef&lt;*&gt;">
+    <DisplayString Condition="Length == 0">empty</DisplayString>
+    <DisplayString Condition="Length != 0">{{ size={Length} }}</DisplayString>
+    <Expand>
+      <Item Name="[size]">Length</Item>
+      <ArrayItems>
+        <Size>Length</Size>
+        <ValuePointer>Data</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
   <Type Name="llvm::SmallString&lt;*&gt;">
     <DisplayString>{BeginX,s}</DisplayString>
     <StringView>BeginX,s</StringView>
@@ -169,6 +179,7 @@ For later versions of Visual Studio, no setup is required.
     </Expand>
   </Type>
 
+
   <!-- Since we're in MSVC, we can assume that the system is little endian.  Therefore
        the little and native cases just require a cast.  Handle this easy case first. Use
        a wildcard for the second template argument (the endianness), but we will use a