Skip to content

Commit

Permalink
[Sema] Check FunctionDecl has identifier before getName. (#6439) (#6457)
Browse files Browse the repository at this point in the history
Use identifier name without check the identifier exists will cause
crash.

Fixes #6426

---------

Co-authored-by: Tex Riddell <texr@microsoft.com>
Co-authored-by: github-actions[bot]
<github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 7581ff4)
(cherry picked from commit 11e1318)
  • Loading branch information
python3kgae authored and pow2clk committed Jul 15, 2024
1 parent c7da630 commit 1b9a796
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tools/clang/lib/Sema/SemaHLSL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15823,7 +15823,8 @@ void TryAddShaderAttrFromTargetProfile(Sema &S, FunctionDecl *FD,

// if this FD isn't the entry point, then we shouldn't add
// a shader attribute to this decl, so just return
if (EntryPointName != FD->getIdentifier()->getName()) {
if (!FD->getIdentifier() ||
EntryPointName != FD->getIdentifier()->getName()) {
return;
}

Expand Down
32 changes: 32 additions & 0 deletions tools/clang/test/SemaHLSL/operator-overload.hlsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// RUN: %dxc -Tps_6_0 -verify %s

// expected-error@+1 {{overloading non-member 'operator==' is not allowed}}
bool operator==(int lhs, int rhs) {
return true;
}

struct A {
float a;
int b;
};

// expected-error@+1 {{overloading non-member 'operator>' is not allowed}}
bool operator>(A a0, A a1) {
return a1.a > a0.a && a1.b > a0.b;
}
// expected-error@+1 {{overloading non-member 'operator==' is not allowed}}
bool operator==(A a0, int i) {
return a0.b == i;
}
// expected-error@+1 {{overloading non-member 'operator<' is not allowed}}
bool operator<(A a0, float f) {
return a0.a < f;
}
// expected-error@+1 {{overloading 'operator++' is not allowed}}
A operator++(A a0) {
a0.a++;
a0.b++;
return a0;
}

void main() {}

0 comments on commit 1b9a796

Please sign in to comment.