<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">This change seems to have broken the buildbots, please fix:<div><span class="Apple-style-span" style="font-family: 'Courier New', courier, monotype; white-space: pre; "><br></span></div><div><span class="Apple-style-span" style="font-family: 'Courier New', courier, monotype; white-space: pre; ">/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp: In member function 'virtual void<unnamed>::ValueMapTest_OperationsWork_Test<gtest_TypeParam_>::TestBody()':</span></div><div><span class="Apple-style-span" style="font-family: Times; "><pre><span class="stdout" style="font-family: 'Courier New', courier, monotype; ">/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:75: error: 'BitcastV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:75: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:77: error: 'AddV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:84: error: 'BitcastV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:84: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:91: error: 'AddV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:91: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:97: error: 'AddV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:97: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp: In member function 'virtual void<unnamed>::ValueMapTest_Iteration_Test<gtest_TypeParam_>::TestBody()':
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:134: error: 'BitcastV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:134: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:137: error: 'AddV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:137: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:156: error: 'BitcastV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:156: error: template argument 1 is invalid
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:158: error: 'AddV' was not declared in this scope
/Users/buildslave/zorg/buildbot/smooshlab/slave/llvm-gcc-x86_64-darwin10-cross-i686-linux/llvm.src/unittests/VMCore/ValueMapTest.cpp:158: error: template argument 1 is invalid</span></pre></span><div><br></div><div><div>On Nov 17, 2010, at 4:59 PM, Francois Pichet wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Author: fpichet<br>Date: Wed Nov 17 18:59:50 2010<br>New Revision: 119600<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=119600&view=rev">http://llvm.org/viewvc/llvm-project?rev=119600&view=rev</a><br>Log:<br>Appease MSVC 2008: you can't use keyword this inside EXPECT_EQ().<br>This is because of bug 331418 on Microsoft Connect.<br><br>Modified:<br> llvm/trunk/unittests/VMCore/ValueMapTest.cpp<br><br>Modified: llvm/trunk/unittests/VMCore/ValueMapTest.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/ValueMapTest.cpp?rev=119600&r1=119599&r2=119600&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/ValueMapTest.cpp?rev=119600&r1=119599&r2=119600&view=diff</a><br>==============================================================================<br>--- llvm/trunk/unittests/VMCore/ValueMapTest.cpp (original)<br>+++ llvm/trunk/unittests/VMCore/ValueMapTest.cpp Wed Nov 17 18:59:50 2010<br>@@ -72,29 +72,29 @@<br> typename ValueMap<TypeParam*, int>::iterator I =<br> VM.find(this->BitcastV.get());<br> ASSERT_TRUE(I != VM.end());<br>- EXPECT_EQ(this->BitcastV.get(), I->first);<br>+ EXPECT_EQ(BitcastV.get(), I->first);<br> EXPECT_EQ(7, I->second);<br>- EXPECT_TRUE(VM.find(this->AddV.get()) == VM.end());<br>+ EXPECT_TRUE(VM.find(AddV.get()) == VM.end());<br><br> // Const find:<br> const ValueMap<TypeParam*, int> &CVM = VM;<br> typename ValueMap<TypeParam*, int>::const_iterator CI =<br> CVM.find(this->BitcastV.get());<br> ASSERT_TRUE(CI != CVM.end());<br>- EXPECT_EQ(this->BitcastV.get(), CI->first);<br>+ EXPECT_EQ(BitcastV.get(), CI->first);<br> EXPECT_EQ(7, CI->second);<br> EXPECT_TRUE(CVM.find(this->AddV.get()) == CVM.end());<br><br> // Insert:<br> std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult1 =<br> VM.insert(std::make_pair(this->AddV.get(), 3));<br>- EXPECT_EQ(this->AddV.get(), InsertResult1.first->first);<br>+ EXPECT_EQ(/*->this*/AddV.get(), InsertResult1.first->first);<br> EXPECT_EQ(3, InsertResult1.first->second);<br> EXPECT_TRUE(InsertResult1.second);<br> EXPECT_EQ(true, VM.count(this->AddV.get()));<br> std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult2 =<br> VM.insert(std::make_pair(this->AddV.get(), 5));<br>- EXPECT_EQ(this->AddV.get(), InsertResult2.first->first);<br>+ EXPECT_EQ(/*this->*/AddV.get(), InsertResult2.first->first);<br> EXPECT_EQ(3, InsertResult2.first->second);<br> EXPECT_FALSE(InsertResult2.second);<br><br>@@ -131,10 +131,10 @@<br> std::pair<TypeParam*, int> value = *I; (void)value;<br> CompileAssertHasType<TypeParam*>(I->first);<br> if (I->second == 2) {<br>- EXPECT_EQ(this->BitcastV.get(), I->first);<br>+ EXPECT_EQ(/*this->*/BitcastV.get(), I->first);<br> I->second = 5;<br> } else if (I->second == 3) {<br>- EXPECT_EQ(this->AddV.get(), I->first);<br>+ EXPECT_EQ(/*this->*/AddV.get(), I->first);<br> I->second = 6;<br> } else {<br> ADD_FAILURE() << "Iterated through an extra value.";<br>@@ -153,9 +153,9 @@<br> std::pair<TypeParam*, int> value = *I; (void)value;<br> CompileAssertHasType<TypeParam*>(I->first);<br> if (I->second == 5) {<br>- EXPECT_EQ(this->BitcastV.get(), I->first);<br>+ EXPECT_EQ(/*this->*/BitcastV.get(), I->first);<br> } else if (I->second == 6) {<br>- EXPECT_EQ(this->AddV.get(), I->first);<br>+ EXPECT_EQ(/*this->*/AddV.get(), I->first);<br> } else {<br> ADD_FAILURE() << "Iterated through an extra value.";<br> }<br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits<br></div></blockquote></div><br></div></body></html>