LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Let header-abi-dumper get lookahead token from preprocessor"

Browse Source
This commit is contained in:
Hsin-Yi Chen
2018-11-22 02:54:10 +00:00
committed by Gerrit Code Review
parent 4619c3295c 14a392a9da
commit 4065033167
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vndk/tools/header-checker/header-abi-dumper/src/fake_decl_source.cpp
View File

@@ -14,7 +14,7 @@
#include "fake_decl_source.h" #include "fake_decl_source.h"
#include <clang/Lex/Lexer.h> #include <clang/Lex/Preprocessor.h>
#include <clang/Sema/Lookup.h> #include <clang/Sema/Lookup.h>
FakeDeclSource::FakeDeclSource(const clang::CompilerInstance &ci) : ci_(ci) {} FakeDeclSource::FakeDeclSource(const clang::CompilerInstance &ci) : ci_(ci) {}
@@ -90,10 +90,8 @@ FakeDeclSource::CreateDecl(clang::Sema::LookupNameKind kind,
CreateCXXRecordDecl(name, decl_context); CreateCXXRecordDecl(name, decl_context);
// If `<` follows the type name, the type must be a template. // If `<` follows the type name, the type must be a template.
// Otherwise, the compiler takes it as a syntax error. // Otherwise, the compiler takes it as a syntax error.
clang::Optional<clang::Token> next_token = clang::Lexer::findNextToken( const clang::Token &next_token = ci_.getPreprocessor().LookAhead(0);
name_info.getLoc(), ci_.getASTContext().getSourceManager(), if (next_token.is(clang::tok::less)) {
ci_.getLangOpts());
if (next_token.hasValue() && next_token->is(clang::tok::less)) {
decl = CreateClassTemplateDecl(cxx_record_decl, decl_context); decl = CreateClassTemplateDecl(cxx_record_decl, decl_context);
} else { } else {
decl = cxx_record_decl; decl = cxx_record_decl;