<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jul 3, 2015 at 2:30 AM, Yaron Keren <span dir="ltr"><<a href="mailto:yaron.keren@gmail.com" target="_blank">yaron.keren@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: yrnkrn<br>
Date: Fri Jul 3 04:30:33 2015<br>
New Revision: 241335<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D241335-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=B3EXEGVlT3xudOmxDW6g0yM5j1oBSbHYQ3OMA8cukYQ&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=241335&view=rev</a><br>
Log:<br>
Revert r241330. It compiled with Visual C++ 2013 and gcc 4.9.1 (mingw) but now fails the bots.<br></blockquote><div><br>Got a link to the buildbot failure or copy/paste the error message(s) from them?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
Modified:<br>
clang-tools-extra/trunk/clang-modernize/LoopConvert/StmtAncestor.h<br>
clang-tools-extra/trunk/clang-rename/RenamingAction.cpp<br>
clang-tools-extra/trunk/clang-rename/RenamingAction.h<br>
clang-tools-extra/trunk/modularize/Modularize.cpp<br>
clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp<br>
clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h<br>
<br>
Modified: clang-tools-extra/trunk/clang-modernize/LoopConvert/StmtAncestor.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_clang-2Dmodernize_LoopConvert_StmtAncestor.h-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=JiYu2CPPVVF5TXssdJQeajJCJ6A2iaqdNke3D-gznkc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/LoopConvert/StmtAncestor.h?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-modernize/LoopConvert/StmtAncestor.h (original)<br>
+++ clang-tools-extra/trunk/clang-modernize/LoopConvert/StmtAncestor.h Fri Jul 3 04:30:33 2015<br>
@@ -170,9 +170,9 @@ private:<br>
class DeclFinderASTVisitor :<br>
public clang::RecursiveASTVisitor<DeclFinderASTVisitor> {<br>
public:<br>
- DeclFinderASTVisitor(std::string Name,<br>
- const StmtGeneratedVarNameMap *GeneratedDecls)<br>
- : Name(std::move(Name)), GeneratedDecls(GeneratedDecls), Found(false) {}<br>
+ DeclFinderASTVisitor(const std::string &Name,<br>
+ const StmtGeneratedVarNameMap *GeneratedDecls) :<br>
+ Name(Name), GeneratedDecls(GeneratedDecls), Found(false) { }<br>
<br>
/// Attempts to find any usages of variables name Name in Body, returning<br>
/// true when it is used in Body. This includes the generated loop variables<br>
<br>
Modified: clang-tools-extra/trunk/clang-rename/RenamingAction.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_clang-2Drename_RenamingAction.cpp-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=AX0FnnXqjTGA2WjodLkZefIvTFe-PUFjmV16sIX_n-c&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-rename/RenamingAction.cpp?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-rename/RenamingAction.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-rename/RenamingAction.cpp Fri Jul 3 04:30:33 2015<br>
@@ -37,11 +37,14 @@ namespace rename {<br>
<br>
class RenamingASTConsumer : public ASTConsumer {<br>
public:<br>
- RenamingASTConsumer(StringRef NewName, StringRef PrevName,<br>
+ RenamingASTConsumer(const std::string &NewName,<br>
+ const std::string &PrevName,<br>
const std::vector<std::string> &USRs,<br>
- tooling::Replacements &Replaces, bool PrintLocations)<br>
+ tooling::Replacements &Replaces,<br>
+ bool PrintLocations)<br>
: NewName(NewName), PrevName(PrevName), USRs(USRs), Replaces(Replaces),<br>
- PrintLocations(PrintLocations) {}<br>
+ PrintLocations(PrintLocations) {<br>
+ }<br>
<br>
void HandleTranslationUnit(ASTContext &Context) override {<br>
const auto &SourceMgr = Context.getSourceManager();<br>
@@ -55,7 +58,7 @@ public:<br>
NewCandidates.clear();<br>
}<br>
<br>
- auto PrevNameLen = PrevName.size();<br>
+ auto PrevNameLen = PrevName.length();<br>
if (PrintLocations)<br>
for (const auto &Loc : RenamingCandidates) {<br>
FullSourceLoc FullLoc(Loc, SourceMgr);<br>
@@ -72,7 +75,7 @@ public:<br>
}<br>
<br>
private:<br>
- StringRef NewName, PrevName;<br>
+ const std::string &NewName, &PrevName;<br>
const std::vector<std::string> &USRs;<br>
tooling::Replacements &Replaces;<br>
bool PrintLocations;<br>
<br>
Modified: clang-tools-extra/trunk/clang-rename/RenamingAction.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_clang-2Drename_RenamingAction.h-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=0u5xO03p31tAaH-zWtvxEelducuzQH8o21Qvkm84pBU&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-rename/RenamingAction.h?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-rename/RenamingAction.h (original)<br>
+++ clang-tools-extra/trunk/clang-rename/RenamingAction.h Fri Jul 3 04:30:33 2015<br>
@@ -25,7 +25,7 @@ namespace rename {<br>
<br>
class RenamingAction {<br>
public:<br>
- RenamingAction(llvm::StringRef NewName, llvm::StringRef PrevName,<br>
+ RenamingAction(const std::string &NewName, const std::string &PrevName,<br>
const std::vector<std::string> &USRs,<br>
tooling::Replacements &Replaces, bool PrintLocations = false)<br>
: NewName(NewName), PrevName(PrevName), USRs(USRs), Replaces(Replaces),<br>
@@ -35,7 +35,7 @@ public:<br>
std::unique_ptr<ASTConsumer> newASTConsumer();<br>
<br>
private:<br>
- llvm::StringRef NewName, PrevName;<br>
+ const std::string &NewName, &PrevName;<br>
const std::vector<std::string> &USRs;<br>
tooling::Replacements &Replaces;<br>
bool PrintLocations;<br>
<br>
Modified: clang-tools-extra/trunk/modularize/Modularize.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_modularize_Modularize.cpp-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=8gL5G5b4ZGcbAdSiuUuGh6YOE7NWBmuYSRIqMAor6xM&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.cpp?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/Modularize.cpp (original)<br>
+++ clang-tools-extra/trunk/modularize/Modularize.cpp Fri Jul 3 04:30:33 2015<br>
@@ -466,9 +466,9 @@ class EntityMap : public StringMap<Small<br>
public:<br>
DenseMap<const FileEntry *, HeaderContents> HeaderContentMismatches;<br>
<br>
- void add(StringRef Name, enum Entry::EntryKind Kind, Location Loc) {<br>
+ void add(const std::string &Name, enum Entry::EntryKind Kind, Location Loc) {<br>
// Record this entity in its header.<br>
- HeaderEntry HE = {Name.str(), Loc};<br>
+ HeaderEntry HE = { Name, Loc };<br>
CurHeaderContents[Loc.File].push_back(HE);<br>
<br>
// Check whether we've seen this entry before.<br>
<br>
Modified: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_pp-2Dtrace_PPCallbacksTracker.cpp-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=liO2lxrOF1o-u9qczaTj4Y_56QCk8pK0C-BpyOUKZYY&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp (original)<br>
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp Fri Jul 3 04:30:33 2015<br>
@@ -627,7 +627,7 @@ void PPCallbacksTracker::appendArgument(<br>
<br>
// Append a double-quoted argument to the top trace item.<br>
void PPCallbacksTracker::appendQuotedArgument(const char *Name,<br>
- llvm::StringRef Value) {<br>
+ const std::string &Value) {<br>
std::string Str;<br>
llvm::raw_string_ostream SS(Str);<br>
SS << "\"" << Value << "\"";<br>
<br>
Modified: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_clang-2Dtools-2Dextra_trunk_pp-2Dtrace_PPCallbacksTracker.h-3Frev-3D241335-26r1-3D241334-26r2-3D241335-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=B0kgCLspzZdwRtWyTprycEiUqkrZBdGfv8k2NtDXwy0&s=r-gDdivO77kQIN_y-ij91T7U-jp5Q7hBk1ZHNdrjGkE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h?rev=241335&r1=241334&r2=241335&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h (original)<br>
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h Fri Jul 3 04:30:33 2015<br>
@@ -215,7 +215,7 @@ public:<br>
void appendArgument(const char *Name, const clang::Module *Value);<br>
<br>
/// \brief Append a double-quoted argument to the top trace item.<br>
- void appendQuotedArgument(const char *Name, llvm::StringRef Value);<br>
+ void appendQuotedArgument(const char *Name, const std::string &Value);<br>
<br>
/// \brief Append a double-quoted file path argument to the top trace item.<br>
void appendFilePathArgument(const char *Name, llvm::StringRef Value);<br>
<br>
<br>
_______________________________________________<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" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>