<div dir="auto">Sounds like a good idea to me.</div><div class="gmail_extra"><br><div class="gmail_quote">On 19 Jan 2018 15:23, "Richard Trieu via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hans,<div><br></div><div>I recommend merging this revision into the release.  It fixes an infinite loop in Scope::dump()</div><div><br></div><div>Richard</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 17, 2018 at 8:28 PM, Richard Trieu 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: rtrieu<br>
Date: Wed Jan 17 20:28:56 2018<br>
New Revision: 322813<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=322813&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=322813&view=rev</a><br>
Log:<br>
Fix Scope::dump()<br>
<br>
The dump function for Scope only has 20 out of the 24 flags.  Since it looped<br>
until no flags were left, having an unknown flag lead to an infinite loop.<br>
That loop has been changed to a single pass for each flag, plus an assert to<br>
alert if new flags are added.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Sema/Scope.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/Scope.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Scope.cpp?rev=322813&r1=322812&r2=322813&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/Sema/Scope<wbr>.cpp?rev=322813&r1=322812&r2=3<wbr>22813&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/Scope.cpp (original)<br>
+++ cfe/trunk/lib/Sema/Scope.cpp Wed Jan 17 20:28:56 2018<br>
@@ -143,72 +143,43 @@ void Scope::dumpImpl(raw_ostream &OS) co<br>
   if (HasFlags)<br>
     OS << "Flags: ";<br>
<br>
-  while (Flags) {<br>
-    if (Flags & FnScope) {<br>
-      OS << "FnScope";<br>
-      Flags &= ~FnScope;<br>
-    } else if (Flags & BreakScope) {<br>
-      OS << "BreakScope";<br>
-      Flags &= ~BreakScope;<br>
-    } else if (Flags & ContinueScope) {<br>
-      OS << "ContinueScope";<br>
-      Flags &= ~ContinueScope;<br>
-    } else if (Flags & DeclScope) {<br>
-      OS << "DeclScope";<br>
-      Flags &= ~DeclScope;<br>
-    } else if (Flags & ControlScope) {<br>
-      OS << "ControlScope";<br>
-      Flags &= ~ControlScope;<br>
-    } else if (Flags & ClassScope) {<br>
-      OS << "ClassScope";<br>
-      Flags &= ~ClassScope;<br>
-    } else if (Flags & BlockScope) {<br>
-      OS << "BlockScope";<br>
-      Flags &= ~BlockScope;<br>
-    } else if (Flags & TemplateParamScope) {<br>
-      OS << "TemplateParamScope";<br>
-      Flags &= ~TemplateParamScope;<br>
-    } else if (Flags & FunctionPrototypeScope) {<br>
-      OS << "FunctionPrototypeScope";<br>
-      Flags &= ~FunctionPrototypeScope;<br>
-    } else if (Flags & FunctionDeclarationScope) {<br>
-      OS << "FunctionDeclarationScope";<br>
-      Flags &= ~FunctionDeclarationScope;<br>
-    } else if (Flags & AtCatchScope) {<br>
-      OS << "AtCatchScope";<br>
-      Flags &= ~AtCatchScope;<br>
-    } else if (Flags & ObjCMethodScope) {<br>
-      OS << "ObjCMethodScope";<br>
-      Flags &= ~ObjCMethodScope;<br>
-    } else if (Flags & SwitchScope) {<br>
-      OS << "SwitchScope";<br>
-      Flags &= ~SwitchScope;<br>
-    } else if (Flags & TryScope) {<br>
-      OS << "TryScope";<br>
-      Flags &= ~TryScope;<br>
-    } else if (Flags & FnTryCatchScope) {<br>
-      OS << "FnTryCatchScope";<br>
-      Flags &= ~FnTryCatchScope;<br>
-    } else if (Flags & SEHTryScope) {<br>
-      OS << "SEHTryScope";<br>
-      Flags &= ~SEHTryScope;<br>
-    } else if (Flags & SEHExceptScope) {<br>
-      OS << "SEHExceptScope";<br>
-      Flags &= ~SEHExceptScope;<br>
-    } else if (Flags & OpenMPDirectiveScope) {<br>
-      OS << "OpenMPDirectiveScope";<br>
-      Flags &= ~OpenMPDirectiveScope;<br>
-    } else if (Flags & OpenMPLoopDirectiveScope) {<br>
-      OS << "OpenMPLoopDirectiveScope";<br>
-      Flags &= ~OpenMPLoopDirectiveScope;<br>
-    } else if (Flags & OpenMPSimdDirectiveScope) {<br>
-      OS << "OpenMPSimdDirectiveScope";<br>
-      Flags &= ~OpenMPSimdDirectiveScope;<br>
-    }<br>
+  std::pair<unsigned, const char *> FlagInfo[] = {<br>
+      {FnScope, "FnScope"},<br>
+      {BreakScope, "BreakScope"},<br>
+      {ContinueScope, "ContinueScope"},<br>
+      {DeclScope, "DeclScope"},<br>
+      {ControlScope, "ControlScope"},<br>
+      {ClassScope, "ClassScope"},<br>
+      {BlockScope, "BlockScope"},<br>
+      {TemplateParamScope, "TemplateParamScope"},<br>
+      {FunctionPrototypeScope, "FunctionPrototypeScope"},<br>
+      {FunctionDeclarationScope, "FunctionDeclarationScope"},<br>
+      {AtCatchScope, "AtCatchScope"},<br>
+      {ObjCMethodScope, "ObjCMethodScope"},<br>
+      {SwitchScope, "SwitchScope"},<br>
+      {TryScope, "TryScope"},<br>
+      {FnTryCatchScope, "FnTryCatchScope"},<br>
+      {OpenMPDirectiveScope, "OpenMPDirectiveScope"},<br>
+      {OpenMPLoopDirectiveScope, "OpenMPLoopDirectiveScope"},<br>
+      {OpenMPSimdDirectiveScope, "OpenMPSimdDirectiveScope"},<br>
+      {EnumScope, "EnumScope"},<br>
+      {SEHTryScope, "SEHTryScope"},<br>
+      {SEHExceptScope, "SEHExceptScope"},<br>
+      {SEHFilterScope, "SEHFilterScope"},<br>
+      {CompoundStmtScope, "CompoundStmtScope"},<br>
+      {ClassInheritanceScope, "ClassInheritanceScope"}};<br>
<br>
-    if (Flags)<br>
-      OS << " | ";<br>
+  for (auto Info : FlagInfo) {<br>
+    if (Flags & Info.first) {<br>
+      OS << Info.second;<br>
+      Flags &= ~Info.first;<br>
+      if (Flags)<br>
+        OS << " | ";<br>
+    }<br>
   }<br>
+<br>
+  assert(Flags == 0 && "Unknown scope flags");<br>
+<br>
   if (HasFlags)<br>
     OS << '\n';<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">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/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>
<br>______________________________<wbr>_________________<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/<wbr>mailman/listinfo/cfe-commits</a><br>
<br></blockquote></div></div>