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

Add a test case for tentative definitions in chained PCH. Fix a bug that completely messed up source locations and thus caused a crash whenever a diagnostic was emitted in chained PCH files. 

llvm-svn: 109660
This commit is contained in:
Sebastian Redl 2010-07-28 21:07:02 +00:00
parent 7e4163d48e
commit 887d6b08fd
4 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Basic/SourceManager.cpp
View File

@ -424,9 +424,12 @@ void SourceManager::PreallocateSLocEntries(ExternalSLocEntrySource *Source,
unsigned NextOffset) {
ExternalSLocEntries = Source;
this->NextOffset = NextOffset;
unsigned CurPrealloc = SLocEntryLoaded.size();
// If we've ever preallocated, we must not count the dummy entry.
if (CurPrealloc) --CurPrealloc;
SLocEntryLoaded.resize(NumSLocEntries + 1);
SLocEntryLoaded[0] = true;
SLocEntryTable.resize(SLocEntryTable.size() + NumSLocEntries);
SLocEntryTable.resize(SLocEntryTable.size() + NumSLocEntries - CurPrealloc);
}
void SourceManager::ClearPreallocatedSLocEntries() {

13
clang/test/PCH/Inputs/chain-external-defs1.h Normal file
View File

@ -0,0 +1,13 @@
// Helper 1 for chain-external-defs.c test
// Tentative definitions
int x;
int x2;
// Should not show up
static int z;
int incomplete_array[];
int incomplete_array2[];
struct S s;

11
clang/test/PCH/Inputs/chain-external-defs2.h Normal file
View File

@ -0,0 +1,11 @@
// Helper 2 for chain-external-defs.c test
// Tentative definitions
int y;
int y2;
// Should still not show up
static int z;
int incomplete_array[];
int incomplete_array3[];

54
clang/test/PCH/chain-external-defs.c Normal file
View File

@ -0,0 +1,54 @@
// Test with pch.
// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-pch -o %t1.pch %S/Inputs/chain-external-defs1.h
// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-pch -o %t2.pch %S/Inputs/chain-external-defs2.h -include-pch %t1.pch -chained-pch
// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -include-pch %t2.pch -emit-llvm -o %t %s
// RUN: echo FINI >> %t
// RUN: FileCheck -input-file=%t -check-prefix=Z %s
// RUN: FileCheck -input-file=%t -check-prefix=XA %s
// RUN: FileCheck -input-file=%t -check-prefix=YA %s
// RUN: FileCheck -input-file=%t -check-prefix=XB %s
// RUN: FileCheck -input-file=%t -check-prefix=YB %s
// RUN: FileCheck -input-file=%t -check-prefix=AA %s
// RUN: FileCheck -input-file=%t -check-prefix=AB %s
// RUN: FileCheck -input-file=%t -check-prefix=AC %s
// RUN: FileCheck -input-file=%t -check-prefix=S %s
// Z-NOT: @z
// XA: @x = common global i32 0
// XA-NOT: @x = common global i32 0
// YA: @y = common global i32 0
// YA-NOT: @y = common global i32 0
// XB: @x2 = global i32 19
// XB-NOT: @x2 = global i32 19
int x2 = 19;
// YB: @y2 = global i32 18
// YB-NOT: @y2 = global i32 18
int y2 = 18;
// AA: @incomplete_array = common global [1 x i32]
// AA-NOT: @incomplete_array = common global [1 x i32]
// AB: @incomplete_array2 = common global [17 x i32]
// AB-NOT: @incomplete_array2 = common global [17 x i32]
int incomplete_array2[17];
// AC: @incomplete_array3 = common global [1 x i32]
// AC-NOT: @incomplete_array3 = common global [1 x i32]
int incomplete_array3[];
// S: @s = common global %struct.S
// S-NOT: @s = common global %struct.S
struct S {
int x, y;
};
// Z: FINI
// XA: FINI
// YA: FINI
// XB: FINI
// YB: FINI
// AA: FINI
// AB: FINI
// AC: FINI
// S: FINI