[llvm] r231168 - unique_ptrify LiveRange::segmentSet

[Kostya Serebryany]

Yours?
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fuzzer/builds/653/steps/build%20clang/logs/stdio

/mnt/b/sanitizer-buildbot5/sanitizer-x86_64-linux-fuzzer/build/llvm/lib/CodeGen/LiveStackAnalysis.cpp:64:16:
error: ‘llvm::LiveStacks::SS2IntervalMap’ has no member named
‘emplace’



On Tue, Mar 3, 2015 at 3:30 PM, David Blaikie <dblaikie at gmail.com> wrote:

> Author: dblaikie
> Date: Tue Mar  3 17:30:40 2015
> New Revision: 231168
>
> URL: http://llvm.org/viewvc/llvm-project?rev=231168&view=rev
> Log:
> unique_ptrify LiveRange::segmentSet
>
> This makes LiveRange non-copyable, and LiveInterval is already
> non-movable (due to the explicit dtor), so now it's non-copyable and
> non-movable.
>
> Fix the one case where we were relying on the (deprecated in C++11)
> implicit copy ctor of LiveInterval (which happened to work because the
> ctor created an object with a null segmentSet, so double-deleting the
> null pointer was fine).
>
> Modified:
>     llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>     llvm/trunk/lib/CodeGen/LiveInterval.cpp
>     llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
>
> Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=231168&r1=231167&r2=231168&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Tue Mar  3 17:30:40 2015
> @@ -199,7 +199,7 @@ namespace llvm {
>      // of live ranges of physical registers in computeRegUnitRange.
>      // After that the set is flushed to the segment vector and deleted.
>      typedef std::set<Segment> SegmentSet;
> -    SegmentSet *segmentSet;
> +    std::unique_ptr<SegmentSet> segmentSet;
>
>      typedef Segments::iterator iterator;
>      iterator begin() { return segments.begin(); }
> @@ -218,15 +218,13 @@ namespace llvm {
>      const_vni_iterator vni_end() const   { return valnos.end(); }
>
>      /// Constructs a new LiveRange object.
> -    LiveRange(bool UseSegmentSet = false) : segmentSet(nullptr) {
> -      if (UseSegmentSet)
> -        segmentSet = new SegmentSet();
> -    }
> +    LiveRange(bool UseSegmentSet = false)
> +        : segmentSet(UseSegmentSet ? llvm::make_unique<SegmentSet>()
> +                                   : nullptr) {}
>
>      /// Constructs a new LiveRange object by copying segments and valnos
> from
>      /// another LiveRange.
> -    LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator)
> -        : segmentSet(nullptr) {
> +    LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator) {
>        assert(Other.segmentSet == nullptr &&
>               "Copying of LiveRanges with active SegmentSets is not
> supported");
>
> @@ -240,8 +238,6 @@ namespace llvm {
>        }
>      }
>
> -    ~LiveRange() { delete segmentSet; }
> -
>      /// advanceTo - Advance the specified iterator to point to the Segment
>      /// containing the specified position, or end() if the position is
> past the
>      /// end of the range.  If no Segment contains this position, but the
> @@ -745,8 +741,6 @@ namespace llvm {
>  #endif
>
>    private:
> -    LiveInterval& operator=(const LiveInterval& rhs) = delete;
> -
>      /// Appends @p Range to SubRanges list.
>      void appendSubRange(SubRange *Range) {
>        Range->Next = SubRanges;
>
> Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=231168&r1=231167&r2=231168&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
> +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Tue Mar  3 17:30:40 2015
> @@ -743,7 +743,6 @@ void LiveRange::flushSegmentSet() {
>        segments.empty() &&
>        "segment set can be used only initially before switching to the
> array");
>    segments.append(segmentSet->begin(), segmentSet->end());
> -  delete segmentSet;
>    segmentSet = nullptr;
>    verify();
>  }
>
> Modified: llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp?rev=231168&r1=231167&r2=231168&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp (original)
> +++ llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp Tue Mar  3 17:30:40 2015
> @@ -61,8 +61,10 @@ LiveStacks::getOrCreateInterval(int Slot
>    assert(Slot >= 0 && "Spill slot indice must be >= 0");
>    SS2IntervalMap::iterator I = S2IMap.find(Slot);
>    if (I == S2IMap.end()) {
> -    I = S2IMap.insert(I, std::make_pair(Slot,
> -            LiveInterval(TargetRegisterInfo::index2StackSlot(Slot),
> 0.0F)));
> +    I = S2IMap.emplace(std::piecewise_construct,
> std::forward_as_tuple(Slot),
> +                       std::forward_as_tuple(
> +                           TargetRegisterInfo::index2StackSlot(Slot),
> 0.0F))
> +            .first;
>      S2RCMap.insert(std::make_pair(Slot, RC));
>    } else {
>      // Use the largest common subclass register class.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150303/9ed5c933/attachment.html>