[cfe-commits] r130384 - /cfe/trunk/lib/Sema/SemaTemplate.cpp

[Francois Pichet]

Author: fpichet
Date: Thu Apr 28 00:12:34 2011
New Revision: 130384

URL: http://llvm.org/viewvc/llvm-project?rev=130384&view=rev
Log:
Update r130381 to check for UO_AddrOf.

Modified:
    cfe/trunk/lib/Sema/SemaTemplate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=130384&r1=130383&r2=130384&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Thu Apr 28 00:12:34 2011
@@ -3093,16 +3093,15 @@
   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) {
+      // 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;
+      }
+
       DRE = dyn_cast<DeclRefExpr>(UnOp->getSubExpr());
       AddressTaken = true;
       AddrOpLoc = UnOp->getOperatorLoc();


_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits