<div dir="ltr"><div><div>Yes. I have reverted this one too.<br><br></div>Thanks<br><br></div>Galina<br><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, May 29, 2017 at 1:57 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Similar to the thread on cfe-dev. Seems like it might be worth figuring out why gtest isn't protecting itself from this, rather than fixing all this.</div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Mon, May 22, 2017 at 10:00 PM Galina Kistanova via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: gkistanova<br>
Date: Tue May 23 00:00:10 2017<br>
New Revision: 303602<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=303602&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=303602&view=rev</a><br>
Log:<br>
Cosmetic. Added braces to address gcc warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else].<br>
<br>
Modified:<br>
    llvm/trunk/unittests/<wbr>DebugInfo/DWARF/<wbr>DWARFDebugInfoTest.cpp<br>
<br>
Modified: llvm/trunk/unittests/<wbr>DebugInfo/DWARF/<wbr>DWARFDebugInfoTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp?rev=303602&r1=303601&r2=303602&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/unittests/<wbr>DebugInfo/DWARF/<wbr>DWARFDebugInfoTest.cpp?rev=<wbr>303602&r1=303601&r2=303602&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/unittests/<wbr>DebugInfo/DWARF/<wbr>DWARFDebugInfoTest.cpp (original)<br>
+++ llvm/trunk/unittests/<wbr>DebugInfo/DWARF/<wbr>DWARFDebugInfoTest.cpp Tue May 23 00:00:10 2017<br>
@@ -311,8 +311,9 @@ void TestAllForms() {<br>
   EXPECT_EQ(Data2, toReference(DieDG.find(Attr_<wbr>DW_FORM_ref2), 0));<br>
   EXPECT_EQ(Data4, toReference(DieDG.find(Attr_<wbr>DW_FORM_ref4), 0));<br>
   EXPECT_EQ(Data8, toReference(DieDG.find(Attr_<wbr>DW_FORM_ref8), 0));<br>
-  if (Version >= 4)<br>
+  if (Version >= 4) {<br>
     EXPECT_EQ(Data8_2, toReference(DieDG.find(Attr_<wbr>DW_FORM_ref_sig8), 0));<br>
+  }<br>
   EXPECT_EQ(UData[0], toReference(DieDG.find(Attr_<wbr>DW_FORM_ref_udata), 0));<br>
<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
@@ -320,15 +321,17 @@ void TestAllForms() {<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   EXPECT_EQ(1ULL, toUnsigned(DieDG.find(Attr_DW_<wbr>FORM_flag_true), 0));<br>
   EXPECT_EQ(0ULL, toUnsigned(DieDG.find(Attr_DW_<wbr>FORM_flag_false), 1));<br>
-  if (Version >= 4)<br>
+  if (Version >= 4) {<br>
     EXPECT_EQ(1ULL, toUnsigned(DieDG.find(Attr_DW_<wbr>FORM_flag_present), 0));<br>
+  }<br>
<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   // Test SLEB128 based forms<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   EXPECT_EQ(SData, toSigned(DieDG.find(Attr_DW_<wbr>FORM_sdata), 0));<br>
-  if (Version >= 5)<br>
+  if (Version >= 5) {<br>
     EXPECT_EQ(ICSData, toSigned(DieDG.find(Attr_DW_<wbr>FORM_implicit_const), 0));<br>
+  }<br>
<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   // Test ULEB128 based forms<br>
@@ -340,9 +343,10 @@ void TestAllForms() {<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   EXPECT_EQ(Dwarf32Values[0],<br>
             toReference(DieDG.find(Attr_<wbr>DW_FORM_GNU_ref_alt), 0));<br>
-  if (Version >= 4)<br>
+  if (Version >= 4) {<br>
     EXPECT_EQ(Dwarf32Values[1],<br>
               toSectionOffset(DieDG.find(<wbr>Attr_DW_FORM_sec_offset), 0));<br>
+  }<br>
<br>
   //---------------------------<wbr>------------------------------<wbr>-------------<br>
   // Add an address at the end to make sure we can decode this value<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</div></div></blockquote></div><br></div></div>