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

Revert my exported-macro hackery. Something is amiss 

llvm-svn: 139734
This commit is contained in:
Douglas Gregor 2011-09-14 20:57:14 +00:00
parent dcd60104c6
commit 4fe9b18182
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/Serialization/ASTWriter.cpp
View File

@ -2223,26 +2223,24 @@ class ASTIdentifierTableTrait {
/// that needs a full IdentifierInfo structure written into the hash
/// table.
bool isInterestingIdentifier(IdentifierInfo *II, MacroInfo *&Macro) {
Macro = 0;
if (II->isPoisoned() ||
II->isExtensionToken() ||
II->getObjCOrBuiltinID() ||
II->getFETokenInfo<void>())
return true;
return hasMacroDefinition(II, Macro);
}
bool hasMacroDefinition(IdentifierInfo *II, MacroInfo *&Macro) {
if (!II->hasMacroDefinition())
return false;
if (!IsModule)
return true;
if (Macro || (Macro = PP.getMacroInfo(II)))
if ((Macro = PP.getMacroInfo(II)))
return Macro->isExported();
return false;
return false;
}
public:
@ -2263,10 +2261,11 @@ public:
EmitKeyDataLength(raw_ostream& Out, IdentifierInfo* II, IdentID ID) {
unsigned KeyLen = II->getLength() + 1;
unsigned DataLen = 4; // 4 bytes for the persistent ID << 1
MacroInfo *Macro = 0;
MacroInfo *Macro;
if (isInterestingIdentifier(II, Macro)) {
DataLen += 2; // 2 bytes for builtin ID, flags
if (hasMacroDefinition(const_cast<IdentifierInfo *>(II), Macro))
if (II->hasMacroDefinition() &&
!PP.getMacroInfo(const_cast<IdentifierInfo *>(II))->isBuiltinMacro())
DataLen += 4;
for (IdentifierResolver::iterator D = IdentifierResolver::begin(II),
DEnd = IdentifierResolver::end();
@ -2291,7 +2290,7 @@ public:
void EmitData(raw_ostream& Out, IdentifierInfo* II,
IdentID ID, unsigned) {
MacroInfo *Macro = 0;
MacroInfo *Macro;
if (!isInterestingIdentifier(II, Macro)) {
clang::io::Emit32(Out, ID << 1);
return;
@ -2299,16 +2298,18 @@ public:
clang::io::Emit32(Out, (ID << 1) | 0x01);
uint32_t Bits = 0;
bool HasMacroDefinition = hasMacroDefinition(II, Macro);
bool hasMacroDefinition
= II->hasMacroDefinition() &&
(Macro || (Macro = PP.getMacroInfo(II))) && !Macro->isBuiltinMacro();
Bits = (uint32_t)II->getObjCOrBuiltinID();
Bits = (Bits << 1) | unsigned(HasMacroDefinition);
Bits = (Bits << 1) | unsigned(hasMacroDefinition);
Bits = (Bits << 1) | unsigned(II->isExtensionToken());
Bits = (Bits << 1) | unsigned(II->isPoisoned());
Bits = (Bits << 1) | unsigned(II->hasRevertedTokenIDToIdentifier());
Bits = (Bits << 1) | unsigned(II->isCPlusPlusOperatorKeyword());
clang::io::Emit16(Out, Bits);
if (HasMacroDefinition)
if (hasMacroDefinition)
clang::io::Emit32(Out, Writer.getMacroOffset(II));
// Emit the declaration IDs in reverse order, because the

5
clang/test/Modules/macros.c
View File

@ -9,8 +9,6 @@
#__export_macro__ INTEGER
#__export_macro__ DOUBLE
int (INTEGER);
#else
__import_module__ macros;
@ -32,7 +30,4 @@ DOUBLE *dp = &d;
#__export_macro__ WIBBLE // expected-error{{no macro named 'WIBBLE' to export}}
void f() {
int i = INTEGER; // the value was exported, the macro was not.
}
#endif