[llvm] r328413 - [X86] Use unique_ptr to simplify memory management. NFC

[David Blaikie via llvm-commits]

On Sat, Mar 24, 2018 at 12:18 AM Craig Topper via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: ctopper
> Date: Sat Mar 24 00:15:47 2018
> New Revision: 328413
>
> URL: http://llvm.org/viewvc/llvm-project?rev=328413&view=rev
> Log:
> [X86] Use unique_ptr to simplify memory management. NFC
>
> Modified:
>     llvm/trunk/utils/TableGen/X86DisassemblerShared.h
>     llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp
>     llvm/trunk/utils/TableGen/X86DisassemblerTables.h
>     llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp
>
> Modified: llvm/trunk/utils/TableGen/X86DisassemblerShared.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerShared.h?rev=328413&r1=328412&r2=328413&view=diff
>
> ==============================================================================
> --- llvm/trunk/utils/TableGen/X86DisassemblerShared.h (original)
> +++ llvm/trunk/utils/TableGen/X86DisassemblerShared.h Sat Mar 24 00:15:47
> 2018
> @@ -49,6 +49,10 @@ struct OpcodeDecision {
>  /// entries in this table, rather than 2^(ATTR_max).
>  struct ContextDecision {
>    OpcodeDecision opcodeDecisions[llvm::X86Disassembler::IC_max];
> +
> +  ContextDecision() {
> +    memset(opcodeDecisions, 0, sizeof(opcodeDecisions));
> +  }
>  };
>
>  #endif
>
> Modified: llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp?rev=328413&r1=328412&r2=328413&view=diff
>
> ==============================================================================
> --- llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp (original)
> +++ llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp Sat Mar 24
> 00:15:47 2018
> @@ -644,21 +644,13 @@ static const char* stringForDecisionType
>  }
>
>  DisassemblerTables::DisassemblerTables() {
> -  unsigned i;
> -
> -  for (i = 0; i < array_lengthof(Tables); i++) {
> -    Tables[i] = new ContextDecision;
> -    memset(Tables[i], 0, sizeof(ContextDecision));
> -  }
> +  for (unsigned i = 0; i < array_lengthof(Tables); i++)
> +    Tables[i] = llvm::make_unique<ContextDecision>();
>

Might be tidier to use a range-based-for here?


>
>    HasConflicts = false;
>  }
>
>  DisassemblerTables::~DisassemblerTables() {
> -  unsigned i;
> -
> -  for (i = 0; i < array_lengthof(Tables); i++)
> -    delete Tables[i];
>  }
>
>  void DisassemblerTables::emitModRMDecision(raw_ostream &o1, raw_ostream
> &o2,
>
> Modified: llvm/trunk/utils/TableGen/X86DisassemblerTables.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.h?rev=328413&r1=328412&r2=328413&view=diff
>
> ==============================================================================
> --- llvm/trunk/utils/TableGen/X86DisassemblerTables.h (original)
> +++ llvm/trunk/utils/TableGen/X86DisassemblerTables.h Sat Mar 24 00:15:47
> 2018
> @@ -41,7 +41,7 @@ private:
>    /// [4] XOP8 map opcode
>    /// [5] XOP9 map opcode
>    /// [6] XOPA map opcode
> -  ContextDecision* Tables[7];
> +  std::unique_ptr<ContextDecision> Tables[7];
>
>    // Table of ModRM encodings.
>    typedef std::map<std::vector<unsigned>, unsigned> ModRMMapTy;
>
> Modified: llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp?rev=328413&r1=328412&r2=328413&view=diff
>
> ==============================================================================
> --- llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp (original)
> +++ llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp Sat Mar 24 00:15:47
> 2018
> @@ -695,7 +695,7 @@ void RecognizableInstr::emitDecodePath(D
>    case X86Local::ThreeDNow: opcodeType = TWOBYTE;      break;
>    }
>
> -  ModRMFilter *filter = nullptr;
> +  std::unique_ptr<ModRMFilter> filter;
>    switch (Form) {
>    default: llvm_unreachable("Invalid form!");
>    case X86Local::Pseudo: llvm_unreachable("Pseudo should not be
> emitted!");
> @@ -707,36 +707,36 @@ void RecognizableInstr::emitDecodePath(D
>    case X86Local::RawFrmDstSrc:
>    case X86Local::RawFrmImm8:
>    case X86Local::RawFrmImm16:
> -    filter = new DumbFilter();
> +    filter = llvm::make_unique<DumbFilter>();
>      break;
>    case X86Local::MRMDestReg:
>    case X86Local::MRMSrcReg:
>    case X86Local::MRMSrcReg4VOp3:
>    case X86Local::MRMSrcRegOp4:
>    case X86Local::MRMXr:
> -    filter = new ModFilter(true);
> +    filter = llvm::make_unique<ModFilter>(true);
>      break;
>    case X86Local::MRMDestMem:
>    case X86Local::MRMSrcMem:
>    case X86Local::MRMSrcMem4VOp3:
>    case X86Local::MRMSrcMemOp4:
>    case X86Local::MRMXm:
> -    filter = new ModFilter(false);
> +    filter = llvm::make_unique<ModFilter>(false);
>      break;
>    case X86Local::MRM0r: case X86Local::MRM1r:
>    case X86Local::MRM2r: case X86Local::MRM3r:
>    case X86Local::MRM4r: case X86Local::MRM5r:
>    case X86Local::MRM6r: case X86Local::MRM7r:
> -    filter = new ExtendedFilter(true, Form - X86Local::MRM0r);
> +    filter = llvm::make_unique<ExtendedFilter>(true, Form -
> X86Local::MRM0r);
>      break;
>    case X86Local::MRM0m: case X86Local::MRM1m:
>    case X86Local::MRM2m: case X86Local::MRM3m:
>    case X86Local::MRM4m: case X86Local::MRM5m:
>    case X86Local::MRM6m: case X86Local::MRM7m:
> -    filter = new ExtendedFilter(false, Form - X86Local::MRM0m);
> +    filter = llvm::make_unique<ExtendedFilter>(false, Form -
> X86Local::MRM0m);
>      break;
>    X86_INSTR_MRM_MAPPING
> -    filter = new ExactFilter(0xC0 + Form - X86Local::MRM_C0);   \
> +    filter = llvm::make_unique<ExactFilter>(0xC0 + Form -
> X86Local::MRM_C0);
>      break;
>    } // switch (Form)
>
> @@ -771,8 +771,6 @@ void RecognizableInstr::emitDecodePath(D
>                            VEX_WPrefix == X86Local::VEX_WIG, AddressSize);
>    }
>
> -  delete filter;
> -
>  #undef MAP
>  }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180326/46a3d48c/attachment.html>