[llvm] r222970 - Revert r222965 "Make MultiClass::DefPrototypes own their Records to fix memory leaks."
Craig Topper
craig.topper at gmail.com
Sat Nov 29 16:56:22 PST 2014
Thanks. It was clean on a build with clang, but I guess gcc is unhappy.
On Sat, Nov 29, 2014 at 6:43 PM, Hans Wennborg <hans at hanshq.net> wrote:
> Author: hans
> Date: Sat Nov 29 18:43:50 2014
> New Revision: 222970
>
> URL: http://llvm.org/viewvc/llvm-project?rev=222970&view=rev
> Log:
> Revert r222965 "Make MultiClass::DefPrototypes own their Records to fix
> memory leaks."
>
> The bots started failing with the error below. I suspect this revision was
> the cause.
>
> FAILED: /home/bb/bin/g++47 -DGTEST_HAS_RTTI=0 -D_GNU_SOURCE
> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fPIC
> -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings
> -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long
> -Wno-maybe-uninitialized -Wno-comment -std=c++11 -ffunction-sections
> -fdata-sections -O3 -DNDEBUG -Ilib/TableGen
> -I/home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen -Iinclude
> -I/home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include
> -fno-exceptions -fno-rtti -MMD -MT
> lib/TableGen/CMakeFiles/LLVMTableGen.dir/TGParser.cpp.o -MF
> "lib/TableGen/CMakeFiles/LLVMTableGen.dir/TGParser.cpp.o.d" -o
> lib/TableGen/CMakeFiles/LLVMTableGen.dir/TGParser.cpp.o -c
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.cpp
> In file included from
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_tempbuf.h:62:0,
> from
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_algo.h:64,
> from
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/algorithm:63,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include/llvm/ADT/StringRef.h:13,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGLexer.h:17,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.h:17,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.cpp:14:
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_construct.h:
> In instantiation of 'void std::_Construct(_T1*, _Args&& ...) [with _T1 =
> std::unique_ptr<llvm::Record>; _Args = {const std::unique_ptr<llvm::Record,
> std::default_delete<llvm::Record> >&}]':
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_uninitialized.h:77:3:
> required from 'static _ForwardIterator
> std::__uninitialized_copy<_TrivialValueTypes>::__uninit_copy(_InputIterator,
> _InputIterator, _ForwardIterator) [with _InputIterator =
> __gnu_cxx::__normal_iterator<const std::unique_ptr<llvm::Record>*,
> std::vector<std::unique_ptr<llvm::Record> > >; _ForwardIterator =
> std::unique_ptr<llvm::Record>*; bool _TrivialValueTypes = false]'
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_uninitialized.h:119:41:
> required from '_ForwardIterator std::uninitialized_copy(_InputIterator,
> _InputIterator, _ForwardIterator) [with _InputIterator =
> __gnu_cxx::__normal_iterator<const std::unique_ptr<llvm::Record>*,
> std::vector<std::unique_ptr<llvm::Record> > >; _ForwardIterator =
> std::unique_ptr<llvm::Record>*]'
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_uninitialized.h:260:63:
> required from '_ForwardIterator
> std::__uninitialized_copy_a(_InputIterator, _InputIterator,
> _ForwardIterator, std::allocator<_Tp>&) [with _InputIterator =
> __gnu_cxx::__normal_iterator<const std::unique_ptr<llvm::Record>*,
> std::vector<std::unique_ptr<llvm::Record> > >; _ForwardIterator =
> std::unique_ptr<llvm::Record>*; _Tp = std::unique_ptr<llvm::Record>]'
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_vector.h:310:9:
> required from 'std::vector<_Tp, _Alloc>::vector(const std::vector<_Tp,
> _Alloc>&) [with _Tp = std::unique_ptr<llvm::Record>; _Alloc =
> std::allocator<std::unique_ptr<llvm::Record> >]'
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include/llvm/TableGen/Record.h:1664:8:
> required from 'constexpr std::pair<_T1, _T2>::pair(_U1&&, _U2&&) [with _U1
> = std::basic_string<char>&; _U2 = llvm::MultiClass;
> <template-parameter-2-3> = void; _T1 = std::basic_string<char>; _T2 =
> llvm::MultiClass]'
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_pair.h:273:72:
> required from 'constexpr std::pair<typename
> std::__decay_and_strip<_T1>::__type, typename
> std::__decay_and_strip<_T2>::__type> std::make_pair(_T1&&, _T2&&) [with _T1
> = std::basic_string<char>&; _T2 = llvm::MultiClass; typename
> std::__decay_and_strip<_T2>::__type = llvm::MultiClass; typename
> std::__decay_and_strip<_T1>::__type = std::basic_string<char>]'
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.cpp:2295:78:
> required from here
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_construct.h:77:7:
> error: use of deleted function 'std::unique_ptr<_Tp, _Dp>::unique_ptr(const
> std::unique_ptr<_Tp, _Dp>&) [with _Tp = llvm::Record; _Dp =
> std::default_delete<llvm::Record>]'
> In file included from
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/memory:86:0,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include/llvm/ADT/STLExtras.h:25,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include/llvm/ADT/ArrayRef.h:14,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/include/llvm/Support/SourceMgr.h:19,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.h:19,
> from
> /home/bb/cmake-llvm-x86_64-linux/llvm-project/llvm/lib/TableGen/TGParser.cpp:14:
> /usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/unique_ptr.h:262:7:
> error: declared here
> ninja: build stopped: subcommand failed.
>
> Modified:
> llvm/trunk/include/llvm/TableGen/Record.h
> llvm/trunk/lib/TableGen/TGParser.cpp
>
> Modified: llvm/trunk/include/llvm/TableGen/Record.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TableGen/Record.h?rev=222970&r1=222969&r2=222970&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/TableGen/Record.h (original)
> +++ llvm/trunk/include/llvm/TableGen/Record.h Sat Nov 29 18:43:50 2014
> @@ -1663,7 +1663,7 @@ raw_ostream &operator<<(raw_ostream &OS,
>
> struct MultiClass {
> Record Rec; // Placeholder for template args and Name.
> - typedef std::vector<std::unique_ptr<Record>> RecordVector;
> + typedef std::vector<Record*> RecordVector;
> RecordVector DefPrototypes;
>
> void dump() const;
>
> Modified: llvm/trunk/lib/TableGen/TGParser.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/TGParser.cpp?rev=222970&r1=222969&r2=222970&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/TableGen/TGParser.cpp (original)
> +++ llvm/trunk/lib/TableGen/TGParser.cpp Sat Nov 29 18:43:50 2014
> @@ -239,7 +239,7 @@ bool TGParser::AddSubMultiClass(MultiCla
> if (AddValue(NewDef.get(), SubMultiClass.RefRange.Start, MCVals[i]))
> return true;
>
> - CurMC->DefPrototypes.push_back(std::move(NewDef));
> + CurMC->DefPrototypes.push_back(NewDef.release());
> }
>
> const std::vector<Init *> &SMCTArgs = SMC->Rec.getTemplateArgs();
> @@ -274,7 +274,7 @@ bool TGParser::AddSubMultiClass(MultiCla
> jend = CurMC->DefPrototypes.end();
> j != jend;
> ++j) {
> - Record *Def = j->get();
> + Record *Def = *j;
>
> if (SetValue(Def, SubMultiClass.RefRange.Start, SMCTArgs[i],
> std::vector<unsigned>(),
> @@ -1258,7 +1258,7 @@ Init *TGParser::ParseSimpleValue(Record
> // known before any use.
> NewRec->setResolveFirst(true);
> // Otherwise, we're inside a multiclass, add it to the multiclass.
> - CurMultiClass->DefPrototypes.push_back(std::move(NewRecOwner));
> + CurMultiClass->DefPrototypes.push_back(NewRecOwner.release());
>
> // Copy the template arguments for the multiclass into the def.
> const std::vector<Init *> &TArgs =
> @@ -2063,7 +2063,7 @@ bool TGParser::ParseDef(MultiClass *CurM
> == CurRec->getNameInit())
> return Error(DefLoc, "def '" + CurRec->getNameInitAsString() +
> "' already defined in this multiclass!");
> - CurMultiClass->DefPrototypes.push_back(std::move(CurRecOwner));
> + CurMultiClass->DefPrototypes.push_back(CurRecOwner.release());
> } else if (ParseObjectBody(CurRec)) {
> return true;
> }
> @@ -2507,7 +2507,7 @@ bool TGParser::ResolveMulticlassDef(Mult
> == CurRec->getNameInit())
> return Error(DefmPrefixLoc, "defm '" +
> CurRec->getNameInitAsString() +
> "' already defined in this multiclass!");
> - CurMultiClass->DefPrototypes.push_back(std::unique_ptr<Record>(CurRec));
> + CurMultiClass->DefPrototypes.push_back(CurRec);
>
> // Copy the template arguments for the multiclass into the new def.
> const std::vector<Init *> &TA =
> @@ -2570,7 +2570,7 @@ bool TGParser::ParseDefm(MultiClass *Cur
>
> // Loop over all the def's in the multiclass, instantiating each one.
> for (unsigned i = 0, e = MC->DefPrototypes.size(); i != e; ++i) {
> - Record *DefProto = MC->DefPrototypes[i].get();
> + Record *DefProto = MC->DefPrototypes[i];
>
> Record *CurRec = InstantiateMulticlassDef(*MC, DefProto, DefmPrefix,
> SMRange(DefmLoc,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
--
~Craig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141129/2c1307dc/attachment.html>
More information about the llvm-commits
mailing list