<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 15, 2015 at 5:55 PM, Richard Smith via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Tue Sep 15 19:55:50 2015<br>
New Revision: 247765<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=247765&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=247765&view=rev</a><br>
Log:<br>
[modules] Fix a corner case in the macro override rules: properly handle overridden leaf module macros.<br></blockquote><div><br></div><div>What exactly is a "leaf module macro"?</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp<br>
    cfe/trunk/test/Modules/macros.c<br>
<br>
Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=247765&r1=247764&r2=247765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=247765&r1=247764&r2=247765&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)<br>
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Tue Sep 15 19:55:50 2015<br>
@@ -145,8 +145,12 @@ void Preprocessor::updateModuleMacroInfo<br>
     NumHiddenOverrides[O] = -1;<br>
<br>
   // Collect all macros that are not overridden by a visible macro.<br>
-  llvm::SmallVector<ModuleMacro *, 16> Worklist(Leaf->second.begin(),<br>
-                                                Leaf->second.end());<br>
+  llvm::SmallVector<ModuleMacro *, 16> Worklist;<br>
+  for (auto *LeafMM : Leaf->second) {<br>
+    assert(LeafMM->getNumOverridingMacros() == 0 && "leaf macro overridden");<br>
+    if (NumHiddenOverrides.lookup(LeafMM) == 0)<br>
+      Worklist.push_back(LeafMM);<br>
+  }<br>
   while (!Worklist.empty()) {<br>
     auto *MM = Worklist.pop_back_val();<br>
     if (CurSubmoduleState->VisibleModules.isVisible(MM->getOwningModule())) {<br>
<br>
Modified: cfe/trunk/test/Modules/macros.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/macros.c?rev=247765&r1=247764&r2=247765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/macros.c?rev=247765&r1=247764&r2=247765&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/macros.c (original)<br>
+++ cfe/trunk/test/Modules/macros.c Tue Sep 15 19:55:50 2015<br>
@@ -18,7 +18,6 @@<br>
 // expected-note@Inputs/macros_right.h:12{{expanding this definition of 'LEFT_RIGHT_DIFFERENT'}}<br>
 // expected-note@Inputs/macros_right.h:13{{expanding this definition of 'LEFT_RIGHT_DIFFERENT2'}}<br>
 // expected-note@Inputs/macros_left.h:14{{other definition of 'LEFT_RIGHT_DIFFERENT'}}<br>
-// expected-note@Inputs/macros_left.h:11{{other definition of 'LEFT_RIGHT_DIFFERENT2'}}<br>
<br>
 @import macros;<br>
<br>
@@ -72,9 +71,14 @@ void f() {<br>
 #  error TOP should not be visible<br>
 #endif<br>
<br>
+#undef INTEGER<br>
+#define INTEGER int<br>
+<br>
 // Import left module (which also imports top)<br>
 @import macros_left;<br>
<br>
+INTEGER my_integer = 0;<br>
+<br>
 #ifndef LEFT<br>
 #  error LEFT should be visible<br>
 #endif<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>