<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 25, 2016 at 8:52 AM, Mehdi Amini <span dir="ltr"><<a href="mailto:mehdi.amini@apple.com" target="_blank">mehdi.amini@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 style="word-wrap:break-word"><br><div><span class=""><blockquote type="cite"><div>On Mar 25, 2016, at 8:29 AM, Mehdi Amini via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:</div><br><div><div style="word-wrap:break-word"><div>Here is one: <a href="http://lab.llvm.org:8011/builders/clang-native-arm-lnt/builds/17076/steps/build%20stage%201/logs/stdio" target="_blank">http://lab.llvm.org:8011/builders/clang-native-arm-lnt/builds/17076/steps/build%20stage%201/logs/stdio</a></div><div>I haven't had time to understand why gcc would resolve differently than clang. </div><div><br></div><div><br></div><div>Also it seems MSVC is doing more move than expected: <a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10868/steps/ninja%20check%202/logs/stdio" target="_blank">http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10868/steps/ninja%20check%202/logs/stdio</a></div><div>I feel this is gonna be challenging at I don't have a windows to reproduce...</div></div></div></blockquote><div><br></div></span><div>I think the test is relying on move-construction elision, I disabled the move part of the test for now. Do you have a suggestion?</div></div></div></blockquote><div><br>I'd like to understand where the move construction is not being elided to better understand the issue.<br><br>But it may be hard to test portably if the fluctuation is too great (eg: if the difference between clang and msvc is greater than the difference between clang with a rebucketing and clang without a rebucketing, then it's hard to set the right bound)<br><br>But it's possible that the elision is happening somewhere we can change so it always or never happens, to make the test more stable.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><span class="HOEnZb"><font color="#888888"><div><br></div><div>-- </div><div>Mehdi</div></font></span><div><div class="h5"><div><br></div><div><br></div><br><blockquote type="cite"><div><div style="word-wrap:break-word"><div><br></div><div>--</div><div>Mehdi</div><div><br></div><div><br></div><div><br><div><blockquote type="cite"><div>On Mar 25, 2016, at 7:43 AM, David Blaikie <<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>> wrote:</div><br><div><p dir="ltr">Got a link to the failure?</p>
<div class="gmail_quote">On Mar 25, 2016 7:19 AM, "Mehdi Amini" <<a href="mailto:mehdi.amini@apple.com" target="_blank">mehdi.amini@apple.com</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="auto"><div>Build failure on gcc bots. Not sure how to test?<br><br>Sent from my iPhone</div><div><br>On Mar 25, 2016, at 7:09 AM, David Blaikie <<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>> wrote:<br><br></div><blockquote type="cite"><div><p dir="ltr">Test case?</p>
<div class="gmail_quote">On Mar 25, 2016 12:16 AM, "Mehdi Amini via llvm-commits" <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-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">Author: mehdi_amini<br>
Date: Fri Mar 25 02:11:31 2016<br>
New Revision: 264391<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=264391&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=264391&view=rev</a><br>
Log:<br>
Fix perfect forwarding for StringMap<br>
<br>
From: Mehdi Amini <<a href="mailto:mehdi.amini@apple.com" target="_blank">mehdi.amini@apple.com</a>><br>
<br>
Modified:<br>
llvm/trunk/include/llvm/ADT/StringMap.h<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/StringMap.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=264391&r1=264390&r2=264391&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=264391&r1=264390&r2=264391&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/StringMap.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/StringMap.h Fri Mar 25 02:11:31 2016<br>
@@ -123,9 +123,9 @@ public:<br>
<br>
explicit StringMapEntry(unsigned strLen)<br>
: StringMapEntryBase(strLen), second() {}<br>
- template <class InitTy><br>
- StringMapEntry(unsigned strLen, InitTy &&V)<br>
- : StringMapEntryBase(strLen), second(std::forward<InitTy>(V)) {}<br>
+ template <typename... InitTy><br>
+ StringMapEntry(unsigned strLen, InitTy &&... InitVals)<br>
+ : StringMapEntryBase(strLen), second(std::forward<InitTy>(InitVals)...) {}<br>
<br>
StringRef getKey() const {<br>
return StringRef(getKeyData(), getKeyLength());<br>
@@ -145,9 +145,9 @@ public:<br>
<br>
/// Create a StringMapEntry for the specified key construct the value using<br>
/// \p InitiVals.<br>
- template <typename AllocatorTy, typename... InitTypes><br>
+ template <typename AllocatorTy, typename... InitTy><br>
static StringMapEntry *Create(StringRef Key, AllocatorTy &Allocator,<br>
- InitTypes &&... InitVals) {<br>
+ InitTy &&... InitVals) {<br>
unsigned KeyLength = Key.size();<br>
<br>
// Allocate a new item with space for the string at the end and a null<br>
@@ -160,8 +160,7 @@ public:<br>
static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));<br>
<br>
// Construct the value.<br>
- new (NewItem)<br>
- StringMapEntry(KeyLength, std::forward<InitTypes>(InitVals)...);<br>
+ new (NewItem) StringMapEntry(KeyLength, std::forward<InitTy>(InitVals)...);<br>
<br>
// Copy the string information.<br>
char *StrBuffer = const_cast<char*>(NewItem->getKeyData());<br>
@@ -172,10 +171,10 @@ public:<br>
}<br>
<br>
/// Create - Create a StringMapEntry with normal malloc/free.<br>
- template<typename InitType><br>
- static StringMapEntry *Create(StringRef Key, InitType &&InitVal) {<br>
+ template <typename... InitType><br>
+ static StringMapEntry *Create(StringRef Key, InitType &&... InitVal) {<br>
MallocAllocator A;<br>
- return Create(Key, A, std::forward<InitType>(InitVal));<br>
+ return Create(Key, A, std::forward<InitType>(InitVal)...);<br>
}<br>
<br>
static StringMapEntry *Create(StringRef Key) {<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</div></blockquote></div></blockquote></div>
</div></blockquote></div><br></div></div>_______________________________________________<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" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br></div></blockquote></div></div></div><br></div></blockquote></div><br></div></div>