1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 3deeedc90d..ae80181d84 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -3093,6 +3093,15 @@ CheckTemplateArgumentAddressOfObjectOrFunction(Sema &S,
   bool AddressTaken = false;
   SourceLocation AddrOpLoc;
   if (UnaryOperator *UnOp = dyn_cast<UnaryOperator>(Arg)) {
+
+    // Support &__uuidof(class_with_uuid) as a non-type template argument.
+    // Very common in Microsoft COM headers.
+    if (S.getLangOptions().Microsoft && 
+      isa<CXXUuidofExpr>(UnOp->getSubExpr())) {
+      Converted = TemplateArgument(ArgIn);
+      return false;
+    }
+
     if (UnOp->getOpcode() == UO_AddrOf) {
       DRE = dyn_cast<DeclRefExpr>(UnOp->getSubExpr());
       AddressTaken = true;