diff options
| author | Greg Clayton <gclayton@apple.com> | 2011-07-07 04:49:07 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2011-07-07 04:49:07 +0000 |
| commit | 1d4313b26166b136b59eb9f743f460b6a355c9ff (patch) | |
| tree | b748959a9a7b6ff346582b996ccd5a320513bf6f | |
| parent | 667be5822096f090f0b5097dcd5bea403a452e0c (diff) | |
| download | bcm5719-llvm-1d4313b26166b136b59eb9f743f460b6a355c9ff.tar.gz bcm5719-llvm-1d4313b26166b136b59eb9f743f460b6a355c9ff.zip | |
Stop the lldb_private::RegularExpression class from implicitly
constructing itself and causing unexpected things to happen
in LLDB.
llvm-svn: 134598
| -rw-r--r-- | lldb/include/lldb/Core/RegularExpression.h | 1 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectTarget.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lldb/include/lldb/Core/RegularExpression.h b/lldb/include/lldb/Core/RegularExpression.h index 3b2688feb41..b73a9d65f83 100644 --- a/lldb/include/lldb/Core/RegularExpression.h +++ b/lldb/include/lldb/Core/RegularExpression.h @@ -51,6 +51,7 @@ public: /// @param[in] flags /// Flags that are passed the the \c regcomp() function. //------------------------------------------------------------------ + explicit RegularExpression (const char* re, int flags = REG_EXTENDED); //------------------------------------------------------------------ diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index 2cce53e6816..3ee7026a4cc 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -465,7 +465,7 @@ public: } else { - matches = exe_ctx.target->GetImages().FindGlobalVariables (arg, + matches = exe_ctx.target->GetImages().FindGlobalVariables (ConstString(arg), true, UINT32_MAX, global_var_list); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 06e92cc7956..75977a309c0 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -4428,7 +4428,7 @@ SymbolFileDWARF::SearchNamespace (const clang::NamespaceDecl *namespace_decl, std::vector<NameToDIE::Info> die_info_array; - size_t num_matches = m_type_index.Find (name, die_info_array); + size_t num_matches = m_type_index.Find (ConstString(name), die_info_array); if (num_matches) { |
