commit dc5d9759063a4eccacdcaeb2b3ac3e157584e63f
author Leonard Chan <leonardchan@google.com> Fri May 10 18:05:15 2019 +0000
committer Leonard Chan <leonardchan@google.com> Fri May 10 18:05:15 2019 +0000
tree f89bf1b46738b9bf06211c1ca735bb68f1729538
parent d5d4df98bb9e0c836cb5b229b3f186637cde7673

Fix and test for assertion error in P41835.

llvm-svn: 360448

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 1b9b7cd..a2de53c 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -2758,6 +2758,12 @@
     return getParenType(
         getFunctionTypeWithExceptionSpec(PT->getInnerType(), ESI));
 
+  // Might be wrapped in a macro qualified type.
+  if (const auto *MQT = dyn_cast<MacroQualifiedType>(Orig))
+    return getMacroQualifiedType(
+        getFunctionTypeWithExceptionSpec(MQT->getUnderlyingType(), ESI),
+        MQT->getMacroIdentifier());
+
   // Might have a calling-convention attribute.
   if (const auto *AT = dyn_cast<AttributedType>(Orig))
     return getAttributedType(