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

Merge "special" types from different modules in the AST reader. 

Different modules may have different views of the various "special"
types in the AST, such as the redefinition type for "id". Merge those
types rather than only considering the redefinition types for the
first AST file loaded.

llvm-svn: 174234
This commit is contained in:
Douglas Gregor 2013-02-01 23:45:03 +00:00
parent 6bade327dc
commit 44180f8f6d
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/lib/Serialization/ASTReader.cpp
View File

@ -2053,8 +2053,24 @@ bool ASTReader::ReadASTBlock(ModuleFile &F) {
break;
case SPECIAL_TYPES:
for (unsigned I = 0, N = Record.size(); I != N; ++I)
SpecialTypes.push_back(getGlobalTypeID(F, Record[I]));
if (SpecialTypes.empty()) {
for (unsigned I = 0, N = Record.size(); I != N; ++I)
SpecialTypes.push_back(getGlobalTypeID(F, Record[I]));
break;
}
if (SpecialTypes.size() != Record.size()) {
Error("invalid special-types record");
return true;
}
for (unsigned I = 0, N = Record.size(); I != N; ++I) {
serialization::TypeID ID = getGlobalTypeID(F, Record[I]);
if (!SpecialTypes[I])
SpecialTypes[I] = ID;
// FIXME: If ID && SpecialTypes[I] != ID, do we need a separate
// merge step?
}
break;
case STATISTICS:

4
clang/test/Modules/Inputs/module.map
View File

@ -155,3 +155,7 @@ module autolink {
link framework "autolink_framework"
}
}
module weird_objc {
header "weird_objc.h"
}

1
clang/test/Modules/Inputs/weird_objc.h Normal file
View File

@ -0,0 +1 @@
typedef struct objc_object { void *super; int wibble; } *id;

13
clang/test/Modules/objc_redef.m Normal file
View File

@ -0,0 +1,13 @@
@import redeclarations_left;
@import weird_objc;
int test(id x) {
return x->wibble;
}
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.map
// RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -emit-module -fmodule-name=weird_objc %S/Inputs/module.map
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t %s -verify
// expected-no-diagnostics