diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-08-19 19:40:40 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-08-19 19:40:40 +0000 |
| commit | c1cf1586f7bbdf8a955a3be79309834ebc25c3af (patch) | |
| tree | 13552922c4c96bf1b334af1eb144b499c84fe7a3 | |
| parent | 295a637416d4bddf5b3d766d9f630a0028596176 (diff) | |
Fix a loop overrun in ComputePreamble when the last remapped file was erased,
and reenable crash recovery test.
- Reparsing is still very crashy / weird, so I had to sprinkle random code into
the remapped input to get it to do what I want (i.e., crash!).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111550 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 4 | ||||
| -rw-r--r-- | test/Index/Inputs/crash-recovery-reparse-remap.c | 8 | ||||
| -rw-r--r-- | test/Index/crash-recovery-reparse.c | 14 |
3 files changed, 17 insertions, 9 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 523b8d0a6c..4395246f49 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -850,6 +850,8 @@ ASTUnit::ComputePreamble(CompilerInvocation &Invocation, // Remove this remapping. We've captured the buffer already. M = PreprocessorOpts.eraseRemappedFile(M); E = PreprocessorOpts.remapped_file_end(); + if (M == E) + break; } } } @@ -875,6 +877,8 @@ ASTUnit::ComputePreamble(CompilerInvocation &Invocation, // Remove this remapping. We've captured the buffer already. M = PreprocessorOpts.eraseRemappedFile(M); E = PreprocessorOpts.remapped_file_buffer_end(); + if (M == E) + break; } } } diff --git a/test/Index/Inputs/crash-recovery-reparse-remap.c b/test/Index/Inputs/crash-recovery-reparse-remap.c index 8a7707a590..0357dbe748 100644 --- a/test/Index/Inputs/crash-recovery-reparse-remap.c +++ b/test/Index/Inputs/crash-recovery-reparse-remap.c @@ -1,3 +1,11 @@ + #warning parsing remapped file + + +int x; + #pragma clang __debug crash + +int x; + diff --git a/test/Index/crash-recovery-reparse.c b/test/Index/crash-recovery-reparse.c index 90ce25d1ad..0697576880 100644 --- a/test/Index/crash-recovery-reparse.c +++ b/test/Index/crash-recovery-reparse.c @@ -1,12 +1,8 @@ -// Disabled, pending investigation. -// RUN: false -// XFAIL: * -// -// RUNX: env CINDEXTEST_EDITING=1 \ -// RUNX: not c-index-test -test-load-source-reparse 1 local \ -// RUNX: -remap-file="%s;%S/Inputs/crash-recovery-reparse-remap.c" \ -// RUNX: %s 2> %t.err -// RUNX: FileCheck < %t.err -check-prefix=CHECK-REPARSE-SOURCE-CRASH %s +// RUN: env CINDEXTEST_EDITING=1 \ +// RUN: not c-index-test -test-load-source-reparse 1 local \ +// RUN: -remap-file="%s;%S/Inputs/crash-recovery-reparse-remap.c" \ +// RUN: %s 2> %t.err +// RUN: FileCheck < %t.err -check-prefix=CHECK-REPARSE-SOURCE-CRASH %s // CHECK-REPARSE-SOURCE-CRASH: Unable to reparse translation unit // // XFAIL: win32 |