From: Nick Lewycky Date: Wed, 5 Aug 2015 21:16:02 +0000 (+0000) Subject: Replace &vector[0] with vector.data() to avoid invalid dereference caught by debug... X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=39879766931ae5c5958b2468527342f5a00a244a;p=oota-llvm.git Replace &vector[0] with vector.data() to avoid invalid dereference caught by debug STL. Also move a '*' for consistency and fix an 80-col violation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244134 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index 18cd621317e..a63cbbd6087 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -103,7 +103,7 @@ namespace options { // use only and will not be passed. static std::vector extra; - static void process_plugin_option(const char* opt_) + static void process_plugin_option(const char *opt_) { if (opt_ == nullptr) return; @@ -322,7 +322,8 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, message(LDPL_ERROR, "Failed to get a view of %s", file->name); return LDPS_ERR; } - BufferRef = MemoryBufferRef(StringRef((const char *)view, file->filesize), ""); + BufferRef = + MemoryBufferRef(StringRef((const char *)view, file->filesize), ""); } else { int64_t offset = 0; // Gold has found what might be IR part-way inside of a file, such as @@ -429,7 +430,7 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, } if (!cf.syms.empty()) { - if (add_symbols(cf.handle, cf.syms.size(), &cf.syms[0]) != LDPS_OK) { + if (add_symbols(cf.handle, cf.syms.size(), cf.syms.data()) != LDPS_OK) { message(LDPL_ERROR, "Unable to add symbols!"); return LDPS_ERR; } @@ -583,7 +584,7 @@ getModuleForFile(LLVMContext &Context, claimed_file &F, ld_plugin_input_file &Info, raw_fd_ostream *ApiFile, StringSet<> &Internalize, StringSet<> &Maybe) { - if (get_symbols(F.handle, F.syms.size(), &F.syms[0]) != LDPS_OK) + if (get_symbols(F.handle, F.syms.size(), F.syms.data()) != LDPS_OK) message(LDPL_FATAL, "Failed to get symbol information"); const void *View;