maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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. 

llvm-svn: 244134
This commit is contained in:
Nick Lewycky 2015-08-05 21:16:02 +00:00
parent 3affe6e264
commit 7282dd774f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/tools/gold/gold-plugin.cpp
View File

@ -103,7 +103,7 @@ namespace options {
// use only and will not be passed. // use only and will not be passed.
static std::vector<const char *> extra; static std::vector<const char *> extra;
static void process_plugin_option(const char* opt_) static void process_plugin_option(const char *opt_)
{ {
if (opt_ == nullptr) if (opt_ == nullptr)
return; 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); message(LDPL_ERROR, "Failed to get a view of %s", file->name);
return LDPS_ERR; return LDPS_ERR;
} }
BufferRef = MemoryBufferRef(StringRef((const char *)view, file->filesize), ""); BufferRef =
MemoryBufferRef(StringRef((const char *)view, file->filesize), "");
} else { } else {
int64_t offset = 0; int64_t offset = 0;
// Gold has found what might be IR part-way inside of a file, such as // 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 (!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!"); message(LDPL_ERROR, "Unable to add symbols!");
return LDPS_ERR; return LDPS_ERR;
} }
@ -583,7 +584,7 @@ getModuleForFile(LLVMContext &Context, claimed_file &F,
ld_plugin_input_file &Info, raw_fd_ostream *ApiFile, ld_plugin_input_file &Info, raw_fd_ostream *ApiFile,
StringSet<> &Internalize, StringSet<> &Maybe) { 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"); message(LDPL_FATAL, "Failed to get symbol information");
const void *View; const void *View;