From: Craig Topper Date: Sun, 28 May 2017 18:24:32 +0000 (+0000) Subject: [TableGen][X86] Replace a global std::vector with a regular array. llvm::find works... X-Git-Tag: llvmorg-5.0.0-rc1~4074 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f62d4e240da840d9fa5092d336279f42763e5a8d;p=platform%2Fupstream%2Fllvm.git [TableGen][X86] Replace a global std::vector with a regular array. llvm::find works on arrays, just need to use std::end to check the result. llvm-svn: 304095 --- diff --git a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp index c2ca573..ca9d2cd 100644 --- a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp +++ b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp @@ -73,7 +73,7 @@ const ManualMapEntry ManualMapSet[] = { }; // Do not add these instructions to any of the folding tables. -const std::vector NoFoldSet = { +const char *const NoFoldSet[] = { "TCRETURNri64", "TCRETURNmi64", // Special dealing (in X86InstrCompiler.td under "TCRETURNri", // "tailcall stuff" section). @@ -645,7 +645,7 @@ void X86FoldTablesEmitter::run(raw_ostream &OS) { // class ptr_rc_tailcall, which can be of a size 32 or 64, to ensure // safe mapping of these instruction we manually map them and exclude // them from the automation. - if (find(NoFoldSet, Rec->getName().str()) != NoFoldSet.end() || + if (find(NoFoldSet, Rec->getName().str()) != std::end(NoFoldSet) || hasRSTRegClass(Inst) || hasPtrTailcallRegClass(Inst)) continue;