6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-19 06:31:18 +00:00
Code Issues Projects Releases Wiki Activity

MC: Don't assume incoming StringRef's are null terminated.

Browse Source 
This can happen when processing command line arguments, which
are often stored as std::string's and later turned into
StringRef's via std::string::data().  Unfortunately this
is not guaranteed to return a null-terminated string
until C++11, causing breakage on platforms that don't do this.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192558 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Will Dietz 2013-10-13 22:09:26 +00:00
parent cf1f4c7dd1
commit 4df7c5baa1
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/MC/SubtargetFeature.h
View File

@ -37,9 +37,9 @@ struct SubtargetFeatureKV {
uint64_t Value; // K-V integer value uint64_t Value; // K-V integer value
uint64_t Implies; // K-V bit mask uint64_t Implies; // K-V bit mask
// Compare routine for std binary search // Compare routine for std::lower_bound
bool operator<(const SubtargetFeatureKV &S) const { bool operator<(StringRef S) const {
return strcmp(Key, S.Key) < 0; return StringRef(Key) < S;
} }
}; };
@ -52,9 +52,9 @@ struct SubtargetInfoKV {
const char *Key; // K-V key string const char *Key; // K-V key string
const void *Value; // K-V pointer value const void *Value; // K-V pointer value
// Compare routine for std binary search // Compare routine for std::lower_bound
bool operator<(const SubtargetInfoKV &S) const { bool operator<(StringRef S) const {
return strcmp(Key, S.Key) < 0; return StringRef(Key) < S;
} }
}; };

4
lib/MC/MCSubtargetInfo.cpp
View File

@ -96,10 +96,8 @@ MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const {
#endif #endif
// Find entry // Find entry
SubtargetInfoKV KV;
KV.Key = CPU.data();
const SubtargetInfoKV *Found = const SubtargetInfoKV *Found =
std::lower_bound(ProcSchedModels, ProcSchedModels+NumProcs, KV); std::lower_bound(ProcSchedModels, ProcSchedModels+NumProcs, CPU);
if (Found == ProcSchedModels+NumProcs || StringRef(Found->Key) != CPU) { if (Found == ProcSchedModels+NumProcs || StringRef(Found->Key) != CPU) {
errs() << "'" << CPU errs() << "'" << CPU
<< "' is not a recognized processor for this target" << "' is not a recognized processor for this target"

5
lib/MC/SubtargetFeature.cpp
View File

@ -121,13 +121,10 @@ void SubtargetFeatures::AddFeature(const StringRef String,
/// Find KV in array using binary search. /// Find KV in array using binary search.
static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A, static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A,
size_t L) { size_t L) {
// Make the lower bound element we're looking for
SubtargetFeatureKV KV;
KV.Key = S.data();
// Determine the end of the array // Determine the end of the array
const SubtargetFeatureKV *Hi = A + L; const SubtargetFeatureKV *Hi = A + L;
// Binary search the array // Binary search the array
const SubtargetFeatureKV *F = std::lower_bound(A, Hi, KV); const SubtargetFeatureKV *F = std::lower_bound(A, Hi, S);
// If not found then return NULL // If not found then return NULL
if (F == Hi || StringRef(F->Key) != S) return NULL; if (F == Hi || StringRef(F->Key) != S) return NULL;
// Return the found array item // Return the found array item