<div dir="ltr"><div>What should I do?</div><div> </div><div><div>I did do a make on Linux with the change, so I don't know what happened.</div><div> </div>I changed my stuff to do the mapping locally.</div><div> </div>
<div>Sorry for the hassle.</div><div> </div><div>-John</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Oct 24, 2013 at 8:54 AM, Argyrios Kyrtzidis <span dir="ltr"><<a href="mailto:kyrtzidis@apple.com" target="_blank">kyrtzidis@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On Oct 24, 2013, at 8:24 AM, NAKAMURA Takumi <<a href="mailto:geek4civic@gmail.com">geek4civic@gmail.com</a>> wrote:<br>
<br>
> John, do you know what you broke? See also my r193346 in clang.<br>
<br>
</div>I reverted Nakamura's fix to again un-break the build.<br>
<br>
John, please build clang as well when making llvm API changes.<br>
<div><div class="h5"><br>
><br>
> 2013/10/24 John Thompson <<a href="mailto:John.Thompson.JTSoftware@gmail.com">John.Thompson.JTSoftware@gmail.com</a>>:<br>
>> Author: jtsoftware<br>
>> Date: Thu Oct 24 09:52:56 2013<br>
>> New Revision: 193350<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=193350&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=193350&view=rev</a><br>
>> Log:<br>
>> Reverting my r193344 checkin due to build breakage.<br>
>><br>
>> Modified:<br>
>> llvm/trunk/docs/YamlIO.rst<br>
>> llvm/trunk/include/llvm/Support/YAMLTraits.h<br>
>> llvm/trunk/lib/Support/YAMLTraits.cpp<br>
>> llvm/trunk/unittests/Support/YAMLIOTest.cpp<br>
>><br>
>> Modified: llvm/trunk/docs/YamlIO.rst<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/YamlIO.rst?rev=193350&r1=193349&r2=193350&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/YamlIO.rst?rev=193350&r1=193349&r2=193350&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/docs/YamlIO.rst (original)<br>
>> +++ llvm/trunk/docs/YamlIO.rst Thu Oct 24 09:52:56 2013<br>
>> @@ -234,7 +234,6 @@ The following types have built-in suppor<br>
>> * float<br>
>> * double<br>
>> * StringRef<br>
>> -* std::string<br>
>> * int64_t<br>
>> * int32_t<br>
>> * int16_t<br>
>><br>
>> Modified: llvm/trunk/include/llvm/Support/YAMLTraits.h<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/YAMLTraits.h?rev=193350&r1=193349&r2=193350&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/YAMLTraits.h?rev=193350&r1=193349&r2=193350&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/include/llvm/Support/YAMLTraits.h (original)<br>
>> +++ llvm/trunk/include/llvm/Support/YAMLTraits.h Thu Oct 24 09:52:56 2013<br>
>> @@ -1,4 +1,4 @@<br>
>> -//===- llvm/Support/YAMLTraits.h -------------------------------*- C++ -*-===//<br>
>> +//===- llvm/Supporrt/YAMLTraits.h -------------------------------*- C++ -*-===//<br>
>> //<br>
>> // The LLVM Linker<br>
>> //<br>
>> @@ -539,12 +539,6 @@ struct ScalarTraits<StringRef> {<br>
>> };<br>
>><br>
>> template<><br>
>> -struct ScalarTraits<std::string> {<br>
>> - static void output(const std::string &, void*, llvm::raw_ostream &);<br>
>> - static StringRef input(StringRef, void*, std::string &);<br>
>> -};<br>
>> -<br>
>> -template<><br>
>> struct ScalarTraits<uint8_t> {<br>
>> static void output(const uint8_t &, void*, llvm::raw_ostream &);<br>
>> static StringRef input(StringRef, void*, uint8_t &);<br>
>><br>
>> Modified: llvm/trunk/lib/Support/YAMLTraits.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=193350&r1=193349&r2=193350&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=193350&r1=193349&r2=193350&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/lib/Support/YAMLTraits.cpp (original)<br>
>> +++ llvm/trunk/lib/Support/YAMLTraits.cpp Thu Oct 24 09:52:56 2013<br>
>> @@ -648,17 +648,6 @@ StringRef ScalarTraits<StringRef>::input<br>
>> return StringRef();<br>
>> }<br>
>><br>
>> -void ScalarTraits<std::string>::output(const std::string &Val, void *,<br>
>> - raw_ostream &Out) {<br>
>> - Out << Val;<br>
>> -}<br>
>> -<br>
>> -StringRef ScalarTraits<std::string>::input(StringRef Scalar, void *,<br>
>> - std::string &Val) {<br>
>> - Val = Scalar.str();<br>
>> - return StringRef();<br>
>> -}<br>
>> -<br>
>> void ScalarTraits<uint8_t>::output(const uint8_t &Val, void *,<br>
>> raw_ostream &Out) {<br>
>> // use temp uin32_t because ostream thinks uint8_t is a character<br>
>><br>
>> Modified: llvm/trunk/unittests/Support/YAMLIOTest.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/YAMLIOTest.cpp?rev=193350&r1=193349&r2=193350&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/YAMLIOTest.cpp?rev=193350&r1=193349&r2=193350&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/unittests/Support/YAMLIOTest.cpp (original)<br>
>> +++ llvm/trunk/unittests/Support/YAMLIOTest.cpp Thu Oct 24 09:52:56 2013<br>
>> @@ -130,7 +130,6 @@ TEST(YAMLIO, TestSequenceMapWriteAndRead<br>
>><br>
>> struct BuiltInTypes {<br>
>> llvm::StringRef str;<br>
>> - std::string stdstr;<br>
>> uint64_t u64;<br>
>> uint32_t u32;<br>
>> uint16_t u16;<br>
>> @@ -154,7 +153,6 @@ namespace yaml {<br>
>> struct MappingTraits<BuiltInTypes> {<br>
>> static void mapping(IO &io, BuiltInTypes& bt) {<br>
>> io.mapRequired("str", bt.str);<br>
>> - io.mapRequired("stdstr", bt.stdstr);<br>
>> io.mapRequired("u64", bt.u64);<br>
>> io.mapRequired("u32", bt.u32);<br>
>> io.mapRequired("u16", bt.u16);<br>
>> @@ -183,7 +181,6 @@ TEST(YAMLIO, TestReadBuiltInTypes) {<br>
>> BuiltInTypes map;<br>
>> Input yin("---\n"<br>
>> "str: hello there\n"<br>
>> - "stdstr: hello where?\n"<br>
>> "u64: 5000000000\n"<br>
>> "u32: 4000000000\n"<br>
>> "u16: 65000\n"<br>
>> @@ -204,7 +201,6 @@ TEST(YAMLIO, TestReadBuiltInTypes) {<br>
>><br>
>> EXPECT_FALSE(yin.error());<br>
>> EXPECT_TRUE(map.str.equals("hello there"));<br>
>> - EXPECT_TRUE(map.stdstr == "hello where?");<br>
>> EXPECT_EQ(map.u64, 5000000000ULL);<br>
>> EXPECT_EQ(map.u32, 4000000000U);<br>
>> EXPECT_EQ(map.u16, 65000);<br>
>> @@ -231,7 +227,6 @@ TEST(YAMLIO, TestReadWriteBuiltInTypes)<br>
>> {<br>
>> BuiltInTypes map;<br>
>> map.str = "one two";<br>
>> - map.stdstr = "three four";<br>
>> map.u64 = 6000000000ULL;<br>
>> map.u32 = 3000000000U;<br>
>> map.u16 = 50000;<br>
>> @@ -260,7 +255,6 @@ TEST(YAMLIO, TestReadWriteBuiltInTypes)<br>
>><br>
>> EXPECT_FALSE(yin.error());<br>
>> EXPECT_TRUE(map.str.equals("one two"));<br>
>> - EXPECT_TRUE(map.stdstr == "three four");<br>
>> EXPECT_EQ(map.u64, 6000000000ULL);<br>
>> EXPECT_EQ(map.u32, 3000000000U);<br>
>> EXPECT_EQ(map.u16, 50000);<br>
>> @@ -285,11 +279,6 @@ struct StringTypes {<br>
>> llvm::StringRef str3;<br>
>> llvm::StringRef str4;<br>
>> llvm::StringRef str5;<br>
>> - std::string stdstr1;<br>
>> - std::string stdstr2;<br>
>> - std::string stdstr3;<br>
>> - std::string stdstr4;<br>
>> - std::string stdstr5;<br>
>> };<br>
>><br>
>> namespace llvm {<br>
>> @@ -302,11 +291,6 @@ namespace yaml {<br>
>> io.mapRequired("str3", st.str3);<br>
>> io.mapRequired("str4", st.str4);<br>
>> io.mapRequired("str5", st.str5);<br>
>> - io.mapRequired("stdstr1", st.stdstr1);<br>
>> - io.mapRequired("stdstr2", st.stdstr2);<br>
>> - io.mapRequired("stdstr3", st.stdstr3);<br>
>> - io.mapRequired("stdstr4", st.stdstr4);<br>
>> - io.mapRequired("stdstr5", st.stdstr5);<br>
>> }<br>
>> };<br>
>> }<br>
>> @@ -321,11 +305,6 @@ TEST(YAMLIO, TestReadWriteStringTypes) {<br>
>> map.str3 = "`ccc";<br>
>> map.str4 = "@ddd";<br>
>> map.str5 = "";<br>
>> - map.stdstr1 = "'eee";<br>
>> - map.stdstr2 = "\"fff";<br>
>> - map.stdstr3 = "`ggg";<br>
>> - map.stdstr4 = "@hhh";<br>
>> - map.stdstr5 = "";<br>
>><br>
>> llvm::raw_string_ostream ostr(intermediate);<br>
>> Output yout(ostr);<br>
>> @@ -338,11 +317,6 @@ TEST(YAMLIO, TestReadWriteStringTypes) {<br>
>> EXPECT_NE(llvm::StringRef::npos, flowOut.find("'`ccc'"));<br>
>> EXPECT_NE(llvm::StringRef::npos, flowOut.find("'@ddd'"));<br>
>> EXPECT_NE(llvm::StringRef::npos, flowOut.find("''\n"));<br>
>> - EXPECT_NE(std::string::npos, flowOut.find("'''eee"));<br>
>> - EXPECT_NE(std::string::npos, flowOut.find("'\"fff'"));<br>
>> - EXPECT_NE(std::string::npos, flowOut.find("'`ggg'"));<br>
>> - EXPECT_NE(std::string::npos, flowOut.find("'@hhh'"));<br>
>> - EXPECT_NE(std::string::npos, flowOut.find("''\n"));<br>
>><br>
>> {<br>
>> Input yin(intermediate);<br>
>> @@ -355,11 +329,6 @@ TEST(YAMLIO, TestReadWriteStringTypes) {<br>
>> EXPECT_TRUE(map.str3.equals("`ccc"));<br>
>> EXPECT_TRUE(map.str4.equals("@ddd"));<br>
>> EXPECT_TRUE(map.str5.equals(""));<br>
>> - EXPECT_TRUE(map.stdstr1 == "'eee");<br>
>> - EXPECT_TRUE(map.stdstr2 == "\"fff");<br>
>> - EXPECT_TRUE(map.stdstr3 == "`ggg");<br>
>> - EXPECT_TRUE(map.stdstr4 == "@hhh");<br>
>> - EXPECT_TRUE(map.stdstr5 == "");<br>
>> }<br>
>> }<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>
>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div>> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
<br>
</blockquote></div><br><br clear="all"><br>-- <br>John Thompson<br><a href="mailto:John.Thompson.JTSoftware@gmail.com">John.Thompson.JTSoftware@gmail.com</a><br>
</div>