[cfe-commits] r147433 - /cfe/trunk/lib/Lex/PPMacroExpansion.cpp

David Blaikie dblaikie at gmail.com
Mon Jan 2 09:24:08 PST 2012


Test case?
From: Abramo Bagnara
Sent: 1/2/2012 12:15 AM
To: cfe-commits at cs.uiuc.edu
Subject: [cfe-commits] r147433 - /cfe/trunk/lib/Lex/PPMacroExpansion.cpp
Author: abramo
Date: Mon Jan  2 04:08:26 2012
New Revision: 147433

URL: http://llvm.org/viewvc/llvm-project?rev=147433&view=rev
Log:
Added a missing case for -Wdisabled-macro-expansion.

Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=147433&r1=147432&r2=147433&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Mon Jan  2 04:08:26 2012
@@ -305,8 +305,10 @@
     // unexpandable.
     if (IdentifierInfo *NewII = Identifier.getIdentifierInfo()) {
       if (MacroInfo *NewMI = getMacroInfo(NewII))
-        if (!NewMI->isEnabled() || NewMI == MI)
+        if (!NewMI->isEnabled() || NewMI == MI) {
           Identifier.setFlag(Token::DisableExpand);
+          Diag(Identifier, diag::pp_disabled_macro_expansion);
+        }
     }

     // Since this is not an identifier token, it can't be macro expanded, so


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



More information about the cfe-commits mailing list