diff --git a/clang/utils/ClangVisualizers/clang.natvis b/clang/utils/ClangVisualizers/clang.natvis
index 83c00b247c0e..6e3ca96ffde3 100644
--- a/clang/utils/ClangVisualizers/clang.natvis
+++ b/clang/utils/ClangVisualizers/clang.natvis
@@ -485,12 +485,30 @@ For later versions of Visual Studio, no setup is required-->
       <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>
     </Expand>
   </Type>
+  <Type Name="clang::OpaquePtr&lt;clang::QualType&gt;">
+    <DisplayString>{*(clang::QualType *)this}</DisplayString>
+    <Expand>
+      <Item Name="Ptr">*(clang::QualType *)this</Item>
+    </Expand>
+  </Type>
+  <Type Name="clang::UnionOpaquePtr&lt;clang::QualType&gt;">
+    <DisplayString>{*(clang::QualType *)this}</DisplayString>
+    <Expand>
+      <Item Name="Ptr">*(clang::QualType *)this</Item>
+    </Expand>
+  </Type>
   <Type Name="clang::OpaquePtr&lt;*&gt;">
     <DisplayString>{($T1 *)Ptr}</DisplayString>
     <Expand>
       <ExpandedItem>($T1 *)Ptr</ExpandedItem>
     </Expand>
   </Type>
+  <Type Name="clang::UnionOpaquePtr&lt;*&gt;">
+    <DisplayString>{($T1 *)Ptr}</DisplayString>
+    <Expand>
+      <ExpandedItem>($T1 *)Ptr</ExpandedItem>
+    </Expand>
+  </Type>
   <Type Name="clang::TemplateParameterList">
     <DisplayString IncludeView="parm0" Condition="NumParams==0"></DisplayString>
     <DisplayString IncludeView="parm0">{*((NamedDecl **)(this+1))[0],view(cpp)}{*this,view(parm1)}</DisplayString>