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

Track changes from clang r212388 

llvm-svn: 212391
This commit is contained in:
Alp Toker 2014-07-06 05:36:57 +00:00
parent 06164dd854
commit 5f83864b7c
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/include/lldb/Symbol/ClangASTContext.h
View File

@ -71,8 +71,7 @@ public:
clang::DiagnosticConsumer *
getDiagnosticConsumer();
clang::TargetOptions *
getTargetOptions();
std::shared_ptr<clang::TargetOptions> &getTargetOptions();
clang::TargetInfo *
getTargetInfo();

4
lldb/source/Expression/ClangExpressionParser.cpp
View File

@ -154,8 +154,8 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
m_compiler->createDiagnostics();
// Create the target instance.
m_compiler->setTarget(TargetInfo::CreateTargetInfo(m_compiler->getDiagnostics(),
&m_compiler->getTargetOpts()));
m_compiler->setTarget(TargetInfo::CreateTargetInfo(
m_compiler->getDiagnostics(), m_compiler->getInvocation().TargetOpts));
assert (m_compiler->hasTarget());

9
lldb/source/Symbol/ClangASTContext.cpp
View File

@ -499,17 +499,14 @@ ClangASTContext::getDiagnosticConsumer()
return m_diagnostic_consumer_ap.get();
}
TargetOptions *
ClangASTContext::getTargetOptions()
{
std::shared_ptr<TargetOptions> &ClangASTContext::getTargetOptions() {
if (m_target_options_rp.get() == nullptr && !m_target_triple.empty())
{
m_target_options_rp.reset ();
m_target_options_rp = new TargetOptions();
m_target_options_rp = std::make_shared<TargetOptions>();
if (m_target_options_rp.get() != nullptr)
m_target_options_rp->Triple = m_target_triple;
}
return m_target_options_rp.get();
return m_target_options_rp;
}