<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 4, 2015 at 5:25 PM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@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: chapuni<br>
Date: Wed Mar 4 19:25:06 2015<br>
New Revision: 231334<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=231334&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=231334&view=rev</a><br>
Log:<br>
Revert r231104, "unique_ptrify FullDependenceAnalysis::DV", to appease msc18 C2280.<br></blockquote><div><br>That just requires providing a move ctor since MSVC won't synthesize one, right? ("FullDependence(FullDependence&&) = default;")<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h<br>
llvm/trunk/lib/Analysis/DependenceAnalysis.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h?rev=231334&r1=231333&r2=231334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h?rev=231334&r1=231333&r2=231334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h (original)<br>
+++ llvm/trunk/include/llvm/Analysis/DependenceAnalysis.h Wed Mar 4 19:25:06 2015<br>
@@ -221,6 +221,9 @@ namespace llvm {<br>
Instruction *Dst,<br>
bool LoopIndependent,<br>
unsigned Levels);<br>
+ ~FullDependence() {<br>
+ delete[] DV;<br>
+ }<br>
<br>
/// isLoopIndependent - Returns true if this is a loop-independent<br>
/// dependence.<br>
@@ -267,7 +270,7 @@ namespace llvm {<br>
unsigned short Levels;<br>
bool LoopIndependent;<br>
bool Consistent; // Init to true, then refine.<br>
- std::unique_ptr<DVEntry[]> DV;<br>
+ DVEntry *DV;<br>
friend class DependenceAnalysis;<br>
};<br>
<br>
<br>
Modified: llvm/trunk/lib/Analysis/DependenceAnalysis.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DependenceAnalysis.cpp?rev=231334&r1=231333&r2=231334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DependenceAnalysis.cpp?rev=231334&r1=231333&r2=231334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Analysis/DependenceAnalysis.cpp (original)<br>
+++ llvm/trunk/lib/Analysis/DependenceAnalysis.cpp Wed Mar 4 19:25:06 2015<br>
@@ -226,12 +226,16 @@ bool Dependence::isScalar(unsigned level<br>
//===----------------------------------------------------------------------===//<br>
// FullDependence methods<br>
<br>
-FullDependence::FullDependence(Instruction *Source, Instruction *Destination,<br>
+FullDependence::FullDependence(Instruction *Source,<br>
+ Instruction *Destination,<br>
bool PossiblyLoopIndependent,<br>
- unsigned CommonLevels)<br>
- : Dependence(Source, Destination), Levels(CommonLevels),<br>
- LoopIndependent(PossiblyLoopIndependent), Consistent(true),<br>
- DV(CommonLevels ? new DVEntry[CommonLevels] : nullptr) {}<br>
+ unsigned CommonLevels) :<br>
+ Dependence(Source, Destination),<br>
+ Levels(CommonLevels),<br>
+ LoopIndependent(PossiblyLoopIndependent) {<br>
+ Consistent = true;<br>
+ DV = CommonLevels ? new DVEntry[CommonLevels] : nullptr;<br>
+}<br>
<br>
// The rest are simple getters that hide the implementation.<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>
</blockquote></div><br></div></div>