diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-12-18 00:52:36 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-12-18 00:52:36 +0000 |
| commit | adff43ad96defb28bad20d8335ab30beadd72ee8 (patch) | |
| tree | 300aeb97813ad657661713a1bee9562cdcac3580 /lib/Frontend/DiagnosticRenderer.cpp | |
| parent | a6f8a6ed1ab163b3c4c863aa4a198fd1cb62fd97 (diff) | |
| download | clang-adff43ad96defb28bad20d8335ab30beadd72ee8.tar.gz | |
More conservative fix for <rdar://problem/12847524> (a crash printing diagnostic ranges).
I'm not really happy with this fix, but I'm confident it's correct.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170397 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/DiagnosticRenderer.cpp')
| -rw-r--r-- | lib/Frontend/DiagnosticRenderer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Frontend/DiagnosticRenderer.cpp b/lib/Frontend/DiagnosticRenderer.cpp index 89d3867aad..88a8706731 100644 --- a/lib/Frontend/DiagnosticRenderer.cpp +++ b/lib/Frontend/DiagnosticRenderer.cpp @@ -363,6 +363,13 @@ static void mapDiagnosticRanges( End = SM->getImmediateExpansionRange(End).second; } BeginFileID = SM->getFileID(Begin); + if (BeginFileID != SM->getFileID(End)) { + // FIXME: Ugly hack to stop a crash; this code is making bad + // assumptions and it's too complicated for me to reason + // about. + Begin = End = SourceLocation(); + break; + } } // Return the spelling location of the beginning and end of the range. |