Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SYCLomatic] Small update for macro utility functions #2448

Merged
merged 13 commits into from
Nov 14, 2024
Merged

[SYCLomatic] Small update for macro utility functions #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f061143
macro
zhiweij1 Nov 5, 2024
166be92
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 7, 2024
d659402
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 7, 2024
d11868a
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 7, 2024
3ac5580
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 7, 2024
60ade1b
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 8, 2024
d69738c
Updata
zhiweij1 Nov 8, 2024
46cc5af
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 8, 2024
d848f33
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 8, 2024
c4f428f
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 11, 2024
ce00cd5
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 11, 2024
02ae108
1
zhiweij1 Nov 12, 2024
37150f2
Merge remote-tracking branch 'origin/SYCLomatic' into study_macro
zhiweij1 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions clang/lib/DPCT/RuleInfra/ExprAnalysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,6 @@ class ArgumentAnalysis : public ExprAnalysis {
// constructor and no migration for it. Start analyzing its argument.
// Replace total string when it is default argument expression.
void initArgumentExpr(const Expr *Expression) {
if (!Expression)
initExpression(Expression);
if (auto Ctor = dyn_cast<CXXConstructExpr>(Expression)) {
if (Ctor->getParenOrBraceRange().isInvalid() && Ctor->getNumArgs() == 1)
Expression = Ctor->getArg(0);
Expand Down
8 changes: 4 additions & 4 deletions clang/lib/DPCT/Utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ SourceRange getStmtExpansionSourceRange(const Stmt *S) {
isInRange(SM.getExpansionRange(Range.getBegin()).getBegin(),
SM.getExpansionRange(Range.getBegin()).getEnd(),
SM.getSpellingLoc(Range.getBegin())) &&
isInRange(SM.getExpansionRange(Range.getBegin()).getBegin(),
SM.getExpansionRange(Range.getBegin()).getEnd(),
isInRange(SM.getExpansionRange(Range.getEnd()).getBegin(),
SM.getExpansionRange(Range.getEnd()).getEnd(),
SM.getSpellingLoc(Range.getEnd()))) {
// MACRO(callExpr())
BeginLoc = SM.getSpellingLoc(Range.getBegin());
Expand Down Expand Up @@ -2176,7 +2176,7 @@ getTheOneBeforeLastImmediateExapansion(const clang::SourceLocation Begin,
// Line 3: #define CALL_KERNEL(C, D) KERNEL(C, D); int a = 0;
// Line 4: void templatefoo2() { CALL_KERNEL(8, 9) }
// There are 3 candidates of the kernel range,
// 1. Line 4 "CALL_KERNEL2(8, AAA)"
// 1. Line 4 "CALL_KERNEL(8, 9)"
// 2. Line 3 "KERNEL(C, D)"
// 3. Line 2 "templatefoo<A,B>CCC"
// The 3rd candidate is the best choice.
Expand Down Expand Up @@ -2280,7 +2280,7 @@ void traversePossibleLocations(const SourceLocation &SL,
if (!SL.isValid())
return;
if (Cache.find(SL.getHashValue()) != Cache.end())
return;
return; // If visited, return;
Cache.insert(SL.getHashValue());
if (!SL.isMacroID()) {
if (isInRange(RangeBegin, RangeEnd, SL)) {
Expand Down