gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Interpreter::getMacro returning 0 when using modules.

Browse Source 
The old code didn't query the modules if the identifier
is updated. This caused some checks to fail such as
CheckABICompatibility().
This commit is contained in:
Raphael Isemann 2017-05-11 15:57:28 +02:00 committed by sftnight
parent 55702c056b
commit ca887faea0
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Interpreter/Interpreter.cpp
View File

@ -44,6 +44,7 @@
#include "clang/Frontend/ASTConsumers.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Frontend/Utils.h"
#include "clang/Lex/ExternalPreprocessorSource.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/Lex/HeaderSearch.h"
#include "clang/Parse/Parser.h"
@ -571,12 +572,17 @@ namespace cling {
}
const MacroInfo* Interpreter::getMacro(llvm::StringRef Macro) const {
const clang::Preprocessor& PP = getCI()->getPreprocessor();
if (const IdentifierInfo* II = PP.getIdentifierInfo(Macro)) {
if (const DefMacroDirective* MD = llvm::dyn_cast_or_null
<DefMacroDirective>(PP.getLocalMacroDirective(II))) {
return MD->getMacroInfo();
}
clang::Preprocessor& PP = getCI()->getPreprocessor();
if (IdentifierInfo* II = PP.getIdentifierInfo(Macro)) {
// If the information about this identifier is out of date, update it from
// the external source.
// FIXME: getIdentifierInfo will probably do this for us once we update
// clang. If so, please remove this manual update.
if (II->isOutOfDate())
PP.getExternalSource()->updateOutOfDateIdentifier(*II);
MacroDefinition MDef = PP.getMacroDefinition(II);
MacroInfo* MI = MDef.getMacroInfo();
return MI;
}
return nullptr;
}