Change AnalyzerOptions::mayInlineCXXMemberFunction to default populate

the config string table.  Also setup a test for dumping the analyzer
configuration for C++.

llvm-svn: 165040

1 files changed, 4 insertions, 3 deletions

diff --git a/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp b/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
index 7e6013bba8a..bb1acb0ce8f 100644
--- a/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
+++ b/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
@@ -19,19 +19,20 @@ using namespace clang;
 using namespace llvm;
 
 bool
-AnalyzerOptions::mayInlineCXXMemberFunction(CXXInlineableMemberKind K) const {
+AnalyzerOptions::mayInlineCXXMemberFunction(CXXInlineableMemberKind K) {
   if (IPAMode < Inlining)
     return false;
 
   if (!CXXMemberInliningMode) {
     static const char *ModeKey = "c++-inlining";
-    std::string ModeStr = Config.lookup(ModeKey);
+    
+    StringRef ModeStr(Config.GetOrCreateValue(ModeKey,
+                                              "methods").getValue());
 
     CXXInlineableMemberKind &MutableMode =
       const_cast<CXXInlineableMemberKind &>(CXXMemberInliningMode);
 
     MutableMode = llvm::StringSwitch<CXXInlineableMemberKind>(ModeStr)
-      .Case("", CIMK_MemberFunctions)
       .Case("constructors", CIMK_Constructors)
       .Case("destructors", CIMK_Destructors)
       .Case("none", CIMK_None)