Summary: | KDevelop4 crashes upon startup | ||
---|---|---|---|
Product: | [Applications] kdevelop | Reporter: | Keith Rusler <xzekecomax> |
Component: | Language Support: CPP (old) | Assignee: | kdevelop-bugs-null |
Status: | RESOLVED FIXED | ||
Severity: | crash | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Sentry Crash Report: |
Description
Keith Rusler
2010-05-05 11:19:54 UTC
commit 0a6d905bf0dd694c763ec28659cd9421c03fb582 Author: David nolden <david.nolden.kde@art-master.de> Date: Sat May 15 12:21:46 2010 +0200 Turn an assertion into a warning BUG: 236411 diff --git a/languages/cpp/preprocessjob.cpp b/languages/cpp/preprocessjob.cpp index 7f28714..3c3b3fd 100644 --- a/languages/cpp/preprocessjob.cpp +++ b/languages/cpp/preprocessjob.cpp @@ -354,10 +354,16 @@ void PreprocessJob::headerSectionEndedInternal(rpp::Stream* stream) if(m_updatingEnvironmentFile) content = KDevelop::ReferencedTopDUContext(contentFromProxy(m_updatingEnvironmentFile->topContext())); else - content = KDevelop::DUChain::self()->chainForDocument(u, m_currentEnvironment); + content = KDevelop::DUChain::self()->chainForDocument(u, m_currentEnvironment, false); m_currentEnvironment->disableIdentityOffsetRestriction(); + if(content && content->parsingEnvironmentFile()->isProxyContext()) + { + kWarning() << "Got proxy-context as content-context for file" << content->url().str() << ", not updating"; + content = KDevelop::ReferencedTopDUContext(); + } + if(content) { //We have found a content-context that we can use parentJob()->setUpdatingContentContext(content); commit b9a833ded4fe2cafa15ebcf527149214baa30714 Author: David nolden <david.nolden.kde@art-master.de> Date: Sat May 15 12:21:46 2010 +0200 Turn an assertion into a warning BUG: 236411 diff --git a/languages/cpp/preprocessjob.cpp b/languages/cpp/preprocessjob.cpp index 7f28714..3c3b3fd 100644 --- a/languages/cpp/preprocessjob.cpp +++ b/languages/cpp/preprocessjob.cpp @@ -354,10 +354,16 @@ void PreprocessJob::headerSectionEndedInternal(rpp::Stream* stream) if(m_updatingEnvironmentFile) content = KDevelop::ReferencedTopDUContext(contentFromProxy(m_updatingEnvironmentFile->topContext())); else - content = KDevelop::DUChain::self()->chainForDocument(u, m_currentEnvironment); + content = KDevelop::DUChain::self()->chainForDocument(u, m_currentEnvironment, false); m_currentEnvironment->disableIdentityOffsetRestriction(); + if(content && content->parsingEnvironmentFile()->isProxyContext()) + { + kWarning() << "Got proxy-context as content-context for file" << content->url().str() << ", not updating"; + content = KDevelop::ReferencedTopDUContext(); + } + if(content) { //We have found a content-context that we can use parentJob()->setUpdatingContentContext(content); |